From 675e56df7a6d754006c3c052a05d1f9cb4428416 Mon Sep 17 00:00:00 2001 From: mrgh97 <44031031+mrgh97@users.noreply.github.com> Date: Wed, 18 Nov 2026 08:48:30 +0000 Subject: [PATCH 1/3] Support Forge 1.x and 2.x release builds Document and validate Forge compatibility lines before release publication. --- .github/workflows/publish-pypi.yml | 228 +++++++++++++++------------ .github/workflows/release-checks.yml | 24 +++ README.md | 19 +++ README_zh.md | 19 +++ migration/release-lines-report.json | 60 +++++++ scripts/check_release_line.py | 88 +++++++++++ scripts/test_release_line.py | 115 ++++++++++++++ 7 files changed, 449 insertions(+), 104 deletions(-) create mode 100644 .github/workflows/release-checks.yml create mode 100644 migration/release-lines-report.json create mode 100644 scripts/check_release_line.py create mode 100644 scripts/test_release_line.py diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index b4f8bdc..b90fb33 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -1,137 +1,157 @@ name: Publish Python package to PyPI - on: workflow_dispatch: inputs: tag: - description: "Existing annotated family tag (for example, forge-msgs-v2.1.0); this input does not create a tag" + description: Existing annotated family tag (for example, forge-msgs-v2.1.0); this input does not create a tag required: true type: string - + release_line: + description: Forge package release line + required: true + type: choice + options: + - 1.x + - 2.x + default: 2.x + publish: + description: Publish verified distributions to PyPI (false builds artifacts only) + required: true + type: boolean + default: false push: tags: - - "forge-*-v*" - + - forge-*-v* concurrency: group: pypi-${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }} cancel-in-progress: false - jobs: resolve: runs-on: ubuntu-latest permissions: contents: read - outputs: tag: ${{ steps.release.outputs.tag }} family: ${{ steps.release.outputs.family }} version: ${{ steps.release.outputs.version }} distribution: ${{ steps.release.outputs.distribution }} - + release_line: ${{ steps.release.outputs.release_line }} steps: - - name: Resolve and validate release tag - id: release - shell: bash - env: - REQUESTED_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }} - GH_TOKEN: ${{ github.token }} - run: | - set -euo pipefail - - if [[ ! "$REQUESTED_TAG" =~ ^forge-(common|msgs|robot|policy|kinematics|tool)-v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then - echo "Unsupported release tag: $REQUESTED_TAG" >&2 - exit 1 - fi - - family="${BASH_REMATCH[1]}" - version="${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BASH_REMATCH[4]}" - - if ! tag_type=$(gh api "repos/${GITHUB_REPOSITORY}/git/ref/tags/${REQUESTED_TAG}" --jq '.object.type'); then - echo "::error::Release tag '${REQUESTED_TAG}' does not exist or cannot be read. Run workflow does not create tags. Create the annotated family tag on the reviewed release commit before retrying." >&2 - exit 1 - fi - if [[ "$tag_type" != "tag" ]]; then - echo "::error::Release '${REQUESTED_TAG}' must be an annotated tag; a lightweight tag is not supported." >&2 - exit 1 - fi - - echo "tag=$REQUESTED_TAG" >> "$GITHUB_OUTPUT" - echo "family=$family" >> "$GITHUB_OUTPUT" - echo "version=$version" >> "$GITHUB_OUTPUT" - echo "distribution=forge-$family" >> "$GITHUB_OUTPUT" - + - name: Resolve and validate release tag + id: release + shell: bash + env: + REQUESTED_TAG: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }} + GH_TOKEN: ${{ github.token }} + SELECTED_LINE: ${{ inputs.release_line }} + run: | + set -euo pipefail + + if [[ ! "$REQUESTED_TAG" =~ ^forge-(common|msgs|robot|policy|kinematics|tool)-v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then + echo "Unsupported release tag: $REQUESTED_TAG" >&2 + exit 1 + fi + + family="${BASH_REMATCH[1]}" + version="${BASH_REMATCH[2]}.${BASH_REMATCH[3]}.${BASH_REMATCH[4]}" + release_line="${BASH_REMATCH[2]}.x" + if [[ "$release_line" != "1.x" && "$release_line" != "2.x" ]]; then + echo "Only Forge 1.x and 2.x releases are supported" >&2; exit 1 + fi + if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" && "$SELECTED_LINE" != "$release_line" ]]; then + echo "Selected line differs from the family tag" >&2; exit 1 + fi + + if ! tag_type=$(gh api "repos/${GITHUB_REPOSITORY}/git/ref/tags/${REQUESTED_TAG}" --jq '.object.type'); then + echo "::error::Release tag '${REQUESTED_TAG}' does not exist or cannot be read. Run workflow does not create tags. Create the annotated family tag on the reviewed release commit before retrying." >&2 + exit 1 + fi + if [[ "$tag_type" != "tag" ]]; then + echo "::error::Release '${REQUESTED_TAG}' must be an annotated tag; a lightweight tag is not supported." >&2 + exit 1 + fi + + echo "tag=$REQUESTED_TAG" >> "$GITHUB_OUTPUT" + echo "family=$family" >> "$GITHUB_OUTPUT" + echo "version=$version" >> "$GITHUB_OUTPUT" + echo "distribution=forge-$family" >> "$GITHUB_OUTPUT" + + echo "release_line=$release_line" >> "$GITHUB_OUTPUT" publish: name: Publish ${{ needs.resolve.outputs.tag }} needs: resolve runs-on: ubuntu-latest - environment: name: pypi-${{ needs.resolve.outputs.family }} - permissions: contents: read id-token: write - steps: - - name: Check out immutable release tag - uses: actions/checkout@v4 - with: - ref: ${{ needs.resolve.outputs.tag }} - fetch-depth: 0 - - - name: Verify annotated tag and commit - shell: bash - env: - RELEASE_TAG: ${{ needs.resolve.outputs.tag }} - run: | - set -euo pipefail - - test "$(git cat-file -t "$RELEASE_TAG")" = "tag" - test "$(git rev-parse "$RELEASE_TAG^{commit}")" = "$(git rev-parse HEAD)" - - python scripts/check_release_versions.py \ - --tag "$RELEASE_TAG" - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.12" - - - name: Set up uv - uses: astral-sh/setup-uv@v5 - with: - enable-cache: true - - - name: Install locked build dependencies - run: | - uv sync --locked --all-packages --all-extras --dev - - - name: Build and validate release distributions - shell: bash - env: - CI_COMMIT_TAG: ${{ needs.resolve.outputs.tag }} - RELEASE_FAMILY: ${{ needs.resolve.outputs.family }} - run: | - set -euo pipefail - - uv run python scripts/build_python_distributions.py \ - --release-family "$RELEASE_FAMILY" \ - --out-dir "dist/release/python/$RELEASE_FAMILY" - - - name: Upload release artifacts - uses: actions/upload-artifact@v4 - with: - name: ${{ needs.resolve.outputs.distribution }}-${{ needs.resolve.outputs.version }} - path: dist/release/python/${{ needs.resolve.outputs.family }}/* - if-no-files-found: error - - - name: Publish wheel and source distribution to PyPI - shell: bash - env: - RELEASE_FAMILY: ${{ needs.resolve.outputs.family }} - run: | - set -euo pipefail - - uv publish --trusted-publishing always \ - "dist/release/python/$RELEASE_FAMILY"/*.whl \ - "dist/release/python/$RELEASE_FAMILY"/*.tar.gz + - name: Check out immutable release tag + uses: actions/checkout@v4 + with: + ref: ${{ needs.resolve.outputs.tag }} + fetch-depth: 0 + persist-credentials: false + - name: Check out release tooling from the workflow commit + uses: actions/checkout@v4 + with: + ref: ${{ github.workflow_sha }} + path: .release-tools + persist-credentials: false + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Validate package release line and source branch + env: + RELEASE_TAG: ${{ needs.resolve.outputs.tag }} + RELEASE_LINE: ${{ needs.resolve.outputs.release_line }} + run: python .release-tools/scripts/check_release_line.py --line "$RELEASE_LINE" --tag "$RELEASE_TAG" --default-branch master + - name: Verify annotated tag and commit + shell: bash + env: + RELEASE_TAG: ${{ needs.resolve.outputs.tag }} + run: | + set -euo pipefail + + test "$(git cat-file -t "$RELEASE_TAG")" = "tag" + test "$(git rev-parse "$RELEASE_TAG^{commit}")" = "$(git rev-parse HEAD)" + + python scripts/check_release_versions.py \ + --tag "$RELEASE_TAG" + - name: Set up uv + uses: astral-sh/setup-uv@v5 + with: + enable-cache: true + - name: Install locked build dependencies + run: | + uv sync --locked --all-packages --all-extras --dev + - name: Build and validate release distributions + shell: bash + env: + CI_COMMIT_TAG: ${{ needs.resolve.outputs.tag }} + RELEASE_FAMILY: ${{ needs.resolve.outputs.family }} + run: | + set -euo pipefail + + uv run python scripts/build_python_distributions.py \ + --release-family "$RELEASE_FAMILY" \ + --out-dir "dist/release/python/$RELEASE_FAMILY" + - name: Upload release artifacts + uses: actions/upload-artifact@v4 + with: + name: ${{ needs.resolve.outputs.distribution }}-${{ needs.resolve.outputs.version }} + path: dist/release/python/${{ needs.resolve.outputs.family }}/* + if-no-files-found: error + - name: Publish wheel and source distribution to PyPI + shell: bash + env: + RELEASE_FAMILY: ${{ needs.resolve.outputs.family }} + run: | + set -euo pipefail + + uv publish --trusted-publishing always \ + "dist/release/python/$RELEASE_FAMILY"/*.whl \ + "dist/release/python/$RELEASE_FAMILY"/*.tar.gz + if: ${{ github.event_name == 'push' || inputs.publish }} diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml new file mode 100644 index 0000000..dfdb687 --- /dev/null +++ b/.github/workflows/release-checks.yml @@ -0,0 +1,24 @@ +name: Release line checks +on: + pull_request: + paths: + - '.github/workflows/**' + - 'scripts/check_release_line.py' + - 'scripts/test_release_line.py' + push: + paths: + - '.github/workflows/**' + - 'scripts/check_release_line.py' + - 'scripts/test_release_line.py' +permissions: + contents: read +jobs: + release-line-checks: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: '3.12' + - name: Test source selection, versions and Forge/Dora compatibility + run: python -m unittest discover -s scripts -p test_release_line.py -v diff --git a/README.md b/README.md index 7d6104c..f77d198 100644 --- a/README.md +++ b/README.md @@ -468,3 +468,22 @@ report security issues using the process in `SECURITY.md`. Forge is licensed under the Apache License, Version 2.0. See `LICENSE` for details. + +## Versioned releases + +| Release line | Source | Package and tag | Runtime compatibility | +| --- | --- | --- | --- | +| Forge 1.x | `stable/1.x` | Family version 1.x, `forge--v1.X.Y` | Forge 1.x peers / Dora 0.4.x | +| Forge 2.x | `master` | Family version 2.x, `forge--v2.X.Y` | Forge 2.x peers / Dora 1.x | + +Run **Publish Python package to PyPI** from `master` for both lines; the selected existing annotated family tag determines the source. Select `release_line=1.x` or `2.x`. Branch ancestry, tag/source identity, `versions.toml` and family metadata must agree. The workflow never creates or moves tags and does not change package versions. + +```bash +# Replace TAG with a new reviewed family tag matching its source metadata. +TAG=forge-msgs-v1.3.2 +gh workflow run publish-pypi.yml --ref master -f tag="$TAG" -f release_line=1.x -f publish=false +TAG=forge-msgs-v2.1.1 +gh workflow run publish-pypi.yml --ref master -f tag="$TAG" -f release_line=2.x -f publish=false +``` + +`publish=false` builds and validates wheel/sdist artifacts only. For an intentional PyPI release set `publish=true`; tag-push events retain automatic publishing and derive the line from the family major. Configure the corresponding `pypi-` Trusted Publisher environment before publishing. Published versions and existing tags are immutable. Use an unused patch version for retries requiring changed code. Successful packaging is not node or hardware acceptance. Forge 2.x is a **breaking change**: deploy matching Forge libraries, nodes and Dora together. Rust crate and C++ distribution publication remain separate from this Python workflow. diff --git a/README_zh.md b/README_zh.md index ba21f39..68e5b00 100644 --- a/README_zh.md +++ b/README_zh.md @@ -412,3 +412,22 @@ flowchart TB ## 许可证 Forge 使用 Apache License 2.0,详见 `LICENSE`。 + +## 分版本发布 + +| 维护线 | 源码 | 包版本与标签 | 运行时兼容 | +| --- | --- | --- | --- | +| Forge 1.x | `stable/1.x` | 包族 1.x,`forge--v1.X.Y` | Forge 1.x 对接节点 / Dora 0.4.x | +| Forge 2.x | `master` | 包族 2.x,`forge--v2.X.Y` | Forge 2.x 对接节点 / Dora 1.x | + +两条维护线均从 `master` 运行 **Publish Python package to PyPI**,选择 `release_line=1.x` 或 `2.x`,并指定已存在的 annotated 包族标签。流水线校验分支归属、标签与源码一致性、`versions.toml` 和包族元数据,不创建/移动标签,也不修改包版本。 + +```bash +# 将 TAG 替换为未发布、已审查且与源码元数据一致的新包族标签。 +TAG=forge-msgs-v1.3.2 +gh workflow run publish-pypi.yml --ref master -f tag="$TAG" -f release_line=1.x -f publish=false +TAG=forge-msgs-v2.1.1 +gh workflow run publish-pypi.yml --ref master -f tag="$TAG" -f release_line=2.x -f publish=false +``` + +`publish=false` 只构建和检查 wheel/sdist;确需发布 PyPI 时设置 `publish=true`。tag push 保留自动发布,按包族主版本确定维护线。发布前需配置对应 `pypi-` Trusted Publisher 环境。已发布版本和现有标签不可覆盖;修改源码后重试需使用未占用的新补丁版本。打包成功不等于节点或硬件验收。Forge 2.x 属于 **breaking change**,库、节点和 Dora 必须对齐部署。Rust crate 和 C++ 发布独立于此 Python 工作流。 diff --git a/migration/release-lines-report.json b/migration/release-lines-report.json new file mode 100644 index 0000000..126b448 --- /dev/null +++ b/migration/release-lines-report.json @@ -0,0 +1,60 @@ +{ + "repository": "PhyAgentOS/forge", + "target": "master", + "scope": "Build and document Forge 1.x and 2.x releases", + "release_line_unit_tests": { + "command": "python -m unittest discover -s scripts -p test_release_line.py -v", + "passed": 12 + }, + "workflow_validation": { + "tool": "actionlint 1.7.12", + "result": "passed" + }, + "distribution_checks": { + "result": "source-only project or separately checked core package families", + "artifacts": [] + }, + "source_profiles": [ + { + "repo": "PhyAgentOS/forge", + "line": "1.x", + "version": "1.3.1", + "forge_majors": [ + 1 + ], + "dora_versions": [], + "kind": "family", + "ready": true + }, + { + "repo": "PhyAgentOS/forge", + "line": "2.x", + "version": "2.1.0", + "forge_majors": [ + 2 + ], + "dora_versions": [], + "kind": "family", + "ready": true + } + ], + "dora_run": { + "single_node": { + "status": "not-run", + "reason": "This change verifies release tooling and version metadata; no current node runtime acceptance is claimed." + }, + "gateway_chain": { + "status": "not-run", + "reason": "Fresh integration acceptance remains required; every such chain must include adapter-forge-gateway from the same Forge line." + } + }, + "linux_binary_release_build": "not-run in this change; existing binary workflow checks are preserved", + "hardware_model_sustained_rollback_acceptance": "pending", + "published_tags_releases_modified": false, + "gitlab_sync": false, + "core_checks": { + "family_version_validators": "passed on both 1.x and 2.x", + "wheel_sdist_family_pairs": 12, + "twine_check": "passed" + } +} diff --git a/scripts/check_release_line.py b/scripts/check_release_line.py new file mode 100644 index 0000000..20a9a07 --- /dev/null +++ b/scripts/check_release_line.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python3 +"""Validate a release tag, its source branch, metadata and Forge/Dora line.""" +import argparse +import json +import os +from pathlib import Path +import re +import subprocess +import tomllib + +CORE_PACKAGES = {'forge-common', 'forge-msgs', 'forge-robot', 'forge-policy', 'forge-tool', 'forge-kinematics', 'forge_msgs', 'forgelab_common'} +SEMVER = r'(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)' + +def git(*args): + return subprocess.check_output(['git', *args], text=True).strip() + +def load(path): + return tomllib.loads(path.read_text()) + +def metadata(root, family=None): + if family: + versions = load(root / 'versions.toml')['packages'] + version = versions[family] + project = load(root / 'packages' / family / 'pyproject.toml')['project'] + if project['version'] != version: + raise ValueError('Family metadata differs from versions.toml') + return version, {int(version.split('.')[0])}, set(), 'family' + manifest = root / 'pyproject.toml' + rust = not manifest.exists() + doc = load(root / 'Cargo.toml') if rust else load(manifest) + version = doc['package' if rust else 'project']['version'] + lock = load(root / ('Cargo.lock' if rust else 'uv.lock')) + forge = {int(p['version'].split('.')[0]) for p in lock['package'] if p['name'] in CORE_PACKAGES} + dora = {tuple(map(int, p['version'].split('.')[:2])) for p in lock['package'] if p['name'] in {'dora-rs', 'dora-node-api'}} + kind = 'python' if not rust and 'build-system' in doc and doc.get('tool', {}).get('uv', {}).get('package') is not False else 'source' + return version, forge, dora, kind + +def validate(root, line, tag, default_branch, requested_version=None): + match = re.fullmatch(r'(?:forge-(common|msgs|robot|policy|kinematics|tool)-)?v' + SEMVER, tag) + if not match: + raise ValueError('Use an existing annotated vX.Y.Z or forge--vX.Y.Z tag') + family = match[1] + version = '.'.join(match.groups()[1:]) + if requested_version is not None and version != requested_version: + raise ValueError('Tag and requested version differ') + tag_ref = 'refs/tags/' + tag + if git('cat-file', '-t', tag_ref) != 'tag': + raise ValueError('An annotated release tag is required') + commit = git('rev-parse', tag_ref + '^{commit}') + if commit != git('rev-parse', 'HEAD'): + raise ValueError('Checkout differs from the release tag') + branch = 'stable/1.x' if line == '1.x' else default_branch + parent = 'refs/remotes/origin/' + branch + ancestry = subprocess.run(['git', 'merge-base', '--is-ancestor', commit, parent], check=False) + if ancestry.returncode != 0: + raise ValueError('Release tag must belong to ' + branch) + actual, forge, dora, kind = metadata(root, family) + if actual != version: + raise ValueError('Tag version differs from source metadata: ' + actual) + major = int(line[0]) + if not version.startswith(str(major) + '.'): + raise ValueError(f'Forge {line} requires node/package version {major}.x; normalize legacy 0.x nodes to 1.0.0 on stable/1.x') + if forge != {major}: + raise ValueError(f'Forge {line} requires resolved Forge major {major}; found {sorted(forge)}. Finish the migration before releasing.') + expected_dora = (0, 4) if line == '1.x' else (1, 0) + if not family and (not dora or any(v[0] != expected_dora[0] or (v[0] == 0 and v[1] != 4) for v in dora)): + raise ValueError(f'Forge {line} requires Dora {expected_dora[0]}.{expected_dora[1]}.x; found {sorted(dora)}') + return dict(tag=tag, version=version, release_line=line, commit=commit, source_branch=branch, package_kind=kind) + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument('--line', choices=['1.x', '2.x'], required=True) + parser.add_argument('--tag', required=True) + parser.add_argument('--default-branch', required=True) + parser.add_argument('--version') + args = parser.parse_args() + try: + result = validate(Path.cwd(), args.line, args.tag, args.default_branch, args.version) + except (ValueError, KeyError, OSError, subprocess.CalledProcessError) as error: + raise SystemExit(str(error)) from error + if os.environ.get('GITHUB_OUTPUT'): + with open(os.environ['GITHUB_OUTPUT'], 'a') as output: + for key, value in result.items(): + output.write(f'{key}={value}\n') + print(json.dumps(result, indent=2)) + +if __name__ == '__main__': + main() diff --git a/scripts/test_release_line.py b/scripts/test_release_line.py new file mode 100644 index 0000000..00cd7ec --- /dev/null +++ b/scripts/test_release_line.py @@ -0,0 +1,115 @@ +"""Exercise the release boundary without installing or starting a robot node.""" +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + +from check_release_line import validate + +class ReleaseLineTests(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + old = Path.cwd() + os.chdir(self.root) + self.addCleanup(os.chdir, old) + self.git('init', '-b', 'main') + self.git('config', 'user.name', 'Release test') + self.git('config', 'user.email', 'release-test@example.invalid') + self.write(1, '1.0.0') + self.git('add', '.') + self.git('commit', '-qm', 'legacy line') + self.git('tag', '-a', 'v1.0.0', '-m', 'legacy') + self.git('update-ref', 'refs/remotes/origin/stable/1.x', 'HEAD') + self.legacy = self.git('rev-parse', 'HEAD') + self.write(2, '2.0.0') + self.git('add', '.') + self.git('commit', '-qm', 'current line') + self.git('tag', '-a', 'v2.0.0', '-m', 'current') + self.git('update-ref', 'refs/remotes/origin/main', 'HEAD') + + def git(self, *args): + return subprocess.check_output(['git', *args], text=True, stderr=subprocess.DEVNULL).strip() + + def write(self, major, version): + (self.root / 'pyproject.toml').write_text(f'[project]\nname="node"\nversion="{version}"\n[build-system]\nrequires=["hatchling"]\nbuild-backend="hatchling.build"\n') + dora = '0.4.1' if major == 1 else '1.0.1' + (self.root / 'uv.lock').write_text(f'[[package]]\nname="forge-msgs"\nversion="{major}.0.0"\n[[package]]\nname="dora-rs"\nversion="{dora}"\n') + + def test_current_line(self): + self.assertEqual(validate(self.root, '2.x', 'v2.0.0', 'main')['package_kind'], 'python') + + def test_legacy_line(self): + self.git('checkout', '-q', 'v1.0.0') + self.assertEqual(validate(self.root, '1.x', 'v1.0.0', 'main')['version'], '1.0.0') + + def test_wrong_ancestry(self): + with self.assertRaisesRegex(ValueError, 'belong to stable'): + validate(self.root, '1.x', 'v2.0.0', 'main') + + def test_incomplete_migration(self): + self.git('checkout', '-q', 'v1.0.0') + with self.assertRaisesRegex(ValueError, 'requires node/package version 2.x'): + validate(self.root, '2.x', 'v1.0.0', 'main') + + def test_zero_version_needs_normalization(self): + self.git('checkout', '-q', 'v1.0.0') + self.write(1, '0.1.0') + self.git('add', '.') + self.git('commit', '-qm', 'legacy zero version') + self.git('tag', '-a', 'v0.1.0', '-m', 'zero') + self.git('update-ref', 'refs/remotes/origin/stable/1.x', 'HEAD') + with self.assertRaisesRegex(ValueError, 'normalize legacy 0.x'): + validate(self.root, '1.x', 'v0.1.0', 'main') + + def test_unrelated_tag(self): + self.git('checkout', '--orphan', 'unrelated') + self.git('commit', '-qm', 'unreviewed source') + self.git('tag', '-a', 'v2.0.1', '-m', 'unrelated') + with self.assertRaisesRegex(ValueError, 'belong to main'): + validate(self.root, '2.x', 'v2.0.1', 'main') + + def test_lightweight_tag(self): + self.git('tag', 'v2.0.1') + with self.assertRaisesRegex(ValueError, 'annotated'): + validate(self.root, '2.x', 'v2.0.1', 'main') + + def test_wrong_checkout(self): + with self.assertRaisesRegex(ValueError, 'Checkout differs'): + validate(self.root, '2.x', 'v1.0.0', 'main') + + def test_version_mismatch(self): + with self.assertRaisesRegex(ValueError, 'requested version'): + validate(self.root, '2.x', 'v2.0.0', 'main', '2.0.1') + (self.root / 'pyproject.toml').write_text('[project]\nversion="2.0.1"\n') + with self.assertRaisesRegex(ValueError, 'source metadata'): + validate(self.root, '2.x', 'v2.0.0', 'main') + + def test_wrong_dora_and_missing_forge(self): + (self.root / 'uv.lock').write_text('[[package]]\nname="forge-msgs"\nversion="2.0.0"\n[[package]]\nname="dora-rs"\nversion="0.4.1"\n') + with self.assertRaisesRegex(ValueError, 'requires Dora'): + validate(self.root, '2.x', 'v2.0.0', 'main') + (self.root / 'uv.lock').write_text('package=[]\n') + with self.assertRaisesRegex(ValueError, 'resolved Forge'): + validate(self.root, '2.x', 'v2.0.0', 'main') + + def test_rust_metadata(self): + (self.root / 'pyproject.toml').unlink() + (self.root / 'Cargo.toml').write_text('[package]\nname="node"\nversion="2.0.0"\n') + (self.root / 'Cargo.lock').write_text('[[package]]\nname="forge_msgs"\nversion="2.0.0"\n[[package]]\nname="dora-node-api"\nversion="1.0.1"\n') + self.assertEqual(validate(self.root, '2.x', 'v2.0.0', 'main')['package_kind'], 'source') + + def test_core_family(self): + path = self.root / 'packages/msgs' + path.mkdir(parents=True) + (path / 'pyproject.toml').write_text('[project]\nversion="2.1.0"\n') + (self.root / 'versions.toml').write_text('[packages]\nmsgs="2.1.0"\n') + self.git('tag', '-a', 'forge-msgs-v2.1.0', '-m', 'msgs') + self.assertEqual(validate(self.root, '2.x', 'forge-msgs-v2.1.0', 'main')['package_kind'], 'family') + with self.assertRaisesRegex(ValueError, 'Use an existing'): + validate(self.root, '2.x', 'forge-unknown-v2.1.0', 'main') + +if __name__ == '__main__': + unittest.main() From 766f2ac4d20b079142eefee99053c010d8b07d57 Mon Sep 17 00:00:00 2001 From: mrgh97 <44031031+mrgh97@users.noreply.github.com> Date: Wed, 18 Nov 2026 08:56:46 +0000 Subject: [PATCH 2/3] Test both release lines and reject mismatched family tags --- migration/release-lines-report.json | 3 +- scripts/tests/test_publish_workflow.py | 50 +++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/migration/release-lines-report.json b/migration/release-lines-report.json index 126b448..c1fc23e 100644 --- a/migration/release-lines-report.json +++ b/migration/release-lines-report.json @@ -55,6 +55,7 @@ "core_checks": { "family_version_validators": "passed on both 1.x and 2.x", "wheel_sdist_family_pairs": 12, - "twine_check": "passed" + "twine_check": "passed", + "release_resolver_cases_passed": 15 } } diff --git a/scripts/tests/test_publish_workflow.py b/scripts/tests/test_publish_workflow.py index 5418d99..af5228a 100644 --- a/scripts/tests/test_publish_workflow.py +++ b/scripts/tests/test_publish_workflow.py @@ -14,8 +14,17 @@ [("tag", 0, 0), ("commit", 0, 1), ("", 1, 1)], ids=["annotated-tag", "lightweight-tag", "missing-tag"], ) +@pytest.mark.parametrize( + "requested_tag,selected_line,event", + [ + ("forge-msgs-v1.3.2", "1.x", "workflow_dispatch"), + ("forge-msgs-v2.1.1", "2.x", "workflow_dispatch"), + ("forge-msgs-v1.3.2", "", "push"), + ("forge-msgs-v2.1.1", "", "push"), + ], +) def test_release_resolver_rejects_missing_or_lightweight_tags( - tmp_path, tag_type, api_status, expected_status + tmp_path, tag_type, api_status, expected_status, requested_tag, selected_line, event ): workflow = yaml.safe_load((ROOT / ".github/workflows/publish-pypi.yml").read_text()) script = workflow["jobs"]["resolve"]["steps"][0]["run"] @@ -31,7 +40,9 @@ def test_release_resolver_rejects_missing_or_lightweight_tags( **os.environ, "PATH": str(tmp_path) + os.pathsep + os.environ["PATH"], "GITHUB_REPOSITORY": "PhyAgentOS/forge", - "REQUESTED_TAG": "forge-msgs-v2.1.0", + "REQUESTED_TAG": requested_tag, + "SELECTED_LINE": selected_line, + "GITHUB_EVENT_NAME": event, "GITHUB_OUTPUT": str(output), "GH_TOKEN": "unused-test-token", "FAKE_TAG_TYPE": tag_type, @@ -45,11 +56,42 @@ def test_release_resolver_rejects_missing_or_lightweight_tags( if expected_status == 0: values = dict(line.split("=", 1) for line in output.read_text().splitlines()) assert values == { - "tag": "forge-msgs-v2.1.0", + "tag": requested_tag, "family": "msgs", - "version": "2.1.0", + "version": requested_tag.removeprefix("forge-msgs-v"), "distribution": "forge-msgs", + "release_line": requested_tag.removeprefix("forge-msgs-v")[0] + ".x", } else: assert "annotated" in result.stderr assert not output.exists() + + +@pytest.mark.parametrize( + "tag,line,message", + [ + ("forge-msgs-v2.1.1", "1.x", "Selected line differs"), + ("forge-msgs-v1.3.2", "2.x", "Selected line differs"), + ("forge-msgs-v3.0.0", "2.x", "Only Forge 1.x and 2.x"), + ], +) +def test_manual_release_rejects_wrong_line_before_remote_lookup(tmp_path, tag, line, message): + workflow = yaml.safe_load((ROOT / ".github/workflows/publish-pypi.yml").read_text()) + fake_gh = tmp_path / "gh" + fake_gh.write_text("#!/bin/sh\nexit 99\n") + fake_gh.chmod(0o755) + result = subprocess.run( + ["bash", "-c", workflow["jobs"]["resolve"]["steps"][0]["run"]], + env={ + **os.environ, + "PATH": str(tmp_path) + os.pathsep + os.environ["PATH"], + "REQUESTED_TAG": tag, + "SELECTED_LINE": line, + "GITHUB_EVENT_NAME": "workflow_dispatch", + }, + capture_output=True, + text=True, + check=False, + ) + assert result.returncode == 1 + assert message in result.stderr From a7c2b7669b984eaf4a9f0010eb102df2c25530f3 Mon Sep 17 00:00:00 2001 From: mrgh97 <44031031+mrgh97@users.noreply.github.com> Date: Wed, 18 Nov 2026 09:09:02 +0000 Subject: [PATCH 3/3] Document mandatory tag-first releases and align repository checks --- README.md | 2 + README_zh.md | 2 + migration/release-lines-report.json | 1 + scripts/check_release_line.py | 152 ++++++++++++++++++-------- scripts/test_release_line.py | 162 ++++++++++++++++------------ 5 files changed, 203 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index f77d198..86b5f35 100644 --- a/README.md +++ b/README.md @@ -471,6 +471,8 @@ details. ## Versioned releases +**Mandatory tag-first release rule:** merge the version/lock change, create an annotated version tag on that reviewed commit, build that exact tag, validate the artifacts, then publish. Moving branch names, untagged commit IDs and replacement of published tags are not release inputs. + | Release line | Source | Package and tag | Runtime compatibility | | --- | --- | --- | --- | | Forge 1.x | `stable/1.x` | Family version 1.x, `forge--v1.X.Y` | Forge 1.x peers / Dora 0.4.x | diff --git a/README_zh.md b/README_zh.md index 68e5b00..f105a77 100644 --- a/README_zh.md +++ b/README_zh.md @@ -415,6 +415,8 @@ Forge 使用 Apache License 2.0,详见 `LICENSE`。 ## 分版本发布 +**发布规则(强制):** 合并版本/锁文件修改 → 在已审查提交上创建 annotated 版本标签 → 从该标签精确构建 → 校验产物 → 发布。禁止使用移动分支、未打标签的提交构建 Release,禁止覆盖已发布标签。 + | 维护线 | 源码 | 包版本与标签 | 运行时兼容 | | --- | --- | --- | --- | | Forge 1.x | `stable/1.x` | 包族 1.x,`forge--v1.X.Y` | Forge 1.x 对接节点 / Dora 0.4.x | diff --git a/migration/release-lines-report.json b/migration/release-lines-report.json index c1fc23e..72afde7 100644 --- a/migration/release-lines-report.json +++ b/migration/release-lines-report.json @@ -14,6 +14,7 @@ "result": "source-only project or separately checked core package families", "artifacts": [] }, + "source_profile_scope": "Local candidate worktrees; proposed maintenance changes are not deployed or merged yet. Full checksums and raw logs remain in the local workspace.", "source_profiles": [ { "repo": "PhyAgentOS/forge", diff --git a/scripts/check_release_line.py b/scripts/check_release_line.py index 20a9a07..d499ffe 100644 --- a/scripts/check_release_line.py +++ b/scripts/check_release_line.py @@ -1,88 +1,146 @@ #!/usr/bin/env python3 """Validate a release tag, its source branch, metadata and Forge/Dora line.""" + import argparse import json import os -from pathlib import Path import re import subprocess +from pathlib import Path + import tomllib -CORE_PACKAGES = {'forge-common', 'forge-msgs', 'forge-robot', 'forge-policy', 'forge-tool', 'forge-kinematics', 'forge_msgs', 'forgelab_common'} -SEMVER = r'(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)' +CORE_PACKAGES = { + "forge-common", + "forge-msgs", + "forge-robot", + "forge-policy", + "forge-tool", + "forge-kinematics", + "forge_msgs", + "forgelab_common", +} +SEMVER = r"(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)" + def git(*args): - return subprocess.check_output(['git', *args], text=True).strip() + return subprocess.check_output(["git", *args], text=True).strip() + def load(path): return tomllib.loads(path.read_text()) + def metadata(root, family=None): if family: - versions = load(root / 'versions.toml')['packages'] + versions = load(root / "versions.toml")["packages"] version = versions[family] - project = load(root / 'packages' / family / 'pyproject.toml')['project'] - if project['version'] != version: - raise ValueError('Family metadata differs from versions.toml') - return version, {int(version.split('.')[0])}, set(), 'family' - manifest = root / 'pyproject.toml' + project = load(root / "packages" / family / "pyproject.toml")["project"] + if project["version"] != version: + raise ValueError("Family metadata differs from versions.toml") + return version, {int(version.split(".")[0])}, set(), "family" + manifest = root / "pyproject.toml" rust = not manifest.exists() - doc = load(root / 'Cargo.toml') if rust else load(manifest) - version = doc['package' if rust else 'project']['version'] - lock = load(root / ('Cargo.lock' if rust else 'uv.lock')) - forge = {int(p['version'].split('.')[0]) for p in lock['package'] if p['name'] in CORE_PACKAGES} - dora = {tuple(map(int, p['version'].split('.')[:2])) for p in lock['package'] if p['name'] in {'dora-rs', 'dora-node-api'}} - kind = 'python' if not rust and 'build-system' in doc and doc.get('tool', {}).get('uv', {}).get('package') is not False else 'source' + doc = load(root / "Cargo.toml") if rust else load(manifest) + version = doc["package" if rust else "project"]["version"] + lock = load(root / ("Cargo.lock" if rust else "uv.lock")) + forge = { + int(p["version"].split(".")[0]) + for p in lock["package"] + if p["name"] in CORE_PACKAGES + } + dora = { + tuple(map(int, p["version"].split(".")[:2])) + for p in lock["package"] + if p["name"] in {"dora-rs", "dora-node-api"} + } + kind = ( + "python" + if not rust + and "build-system" in doc + and doc.get("tool", {}).get("uv", {}).get("package") is not False + else "source" + ) return version, forge, dora, kind + def validate(root, line, tag, default_branch, requested_version=None): - match = re.fullmatch(r'(?:forge-(common|msgs|robot|policy|kinematics|tool)-)?v' + SEMVER, tag) + match = re.fullmatch( + r"(?:forge-(common|msgs|robot|policy|kinematics|tool)-)?v" + SEMVER, tag + ) if not match: - raise ValueError('Use an existing annotated vX.Y.Z or forge--vX.Y.Z tag') + raise ValueError( + "Use an existing annotated vX.Y.Z or forge--vX.Y.Z tag" + ) family = match[1] - version = '.'.join(match.groups()[1:]) + version = ".".join(match.groups()[1:]) if requested_version is not None and version != requested_version: - raise ValueError('Tag and requested version differ') - tag_ref = 'refs/tags/' + tag - if git('cat-file', '-t', tag_ref) != 'tag': - raise ValueError('An annotated release tag is required') - commit = git('rev-parse', tag_ref + '^{commit}') - if commit != git('rev-parse', 'HEAD'): - raise ValueError('Checkout differs from the release tag') - branch = 'stable/1.x' if line == '1.x' else default_branch - parent = 'refs/remotes/origin/' + branch - ancestry = subprocess.run(['git', 'merge-base', '--is-ancestor', commit, parent], check=False) + raise ValueError("Tag and requested version differ") + tag_ref = "refs/tags/" + tag + if git("cat-file", "-t", tag_ref) != "tag": + raise ValueError("An annotated release tag is required") + commit = git("rev-parse", tag_ref + "^{commit}") + if commit != git("rev-parse", "HEAD"): + raise ValueError("Checkout differs from the release tag") + branch = "stable/1.x" if line == "1.x" else default_branch + parent = "refs/remotes/origin/" + branch + ancestry = subprocess.run( + ["git", "merge-base", "--is-ancestor", commit, parent], check=False + ) if ancestry.returncode != 0: - raise ValueError('Release tag must belong to ' + branch) + raise ValueError("Release tag must belong to " + branch) actual, forge, dora, kind = metadata(root, family) if actual != version: - raise ValueError('Tag version differs from source metadata: ' + actual) + raise ValueError("Tag version differs from source metadata: " + actual) major = int(line[0]) - if not version.startswith(str(major) + '.'): - raise ValueError(f'Forge {line} requires node/package version {major}.x; normalize legacy 0.x nodes to 1.0.0 on stable/1.x') + if not version.startswith(str(major) + "."): + raise ValueError( + f"Forge {line} requires node/package version {major}.x; " + "normalize legacy 0.x nodes to 1.0.0 on stable/1.x" + ) if forge != {major}: - raise ValueError(f'Forge {line} requires resolved Forge major {major}; found {sorted(forge)}. Finish the migration before releasing.') - expected_dora = (0, 4) if line == '1.x' else (1, 0) - if not family and (not dora or any(v[0] != expected_dora[0] or (v[0] == 0 and v[1] != 4) for v in dora)): - raise ValueError(f'Forge {line} requires Dora {expected_dora[0]}.{expected_dora[1]}.x; found {sorted(dora)}') - return dict(tag=tag, version=version, release_line=line, commit=commit, source_branch=branch, package_kind=kind) + raise ValueError( + f"Forge {line} requires resolved Forge major {major}; found {sorted(forge)}. " + "Finish the migration before releasing." + ) + expected_dora = (0, 4) if line == "1.x" else (1, 0) + if not family and ( + not dora + or any(v[0] != expected_dora[0] or (v[0] == 0 and v[1] != 4) for v in dora) + ): + raise ValueError( + f"Forge {line} requires Dora {expected_dora[0]}.{expected_dora[1]}.x; " + f"found {sorted(dora)}" + ) + return dict( + tag=tag, + version=version, + release_line=line, + commit=commit, + source_branch=branch, + package_kind=kind, + ) + def main(): parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument('--line', choices=['1.x', '2.x'], required=True) - parser.add_argument('--tag', required=True) - parser.add_argument('--default-branch', required=True) - parser.add_argument('--version') + parser.add_argument("--line", choices=["1.x", "2.x"], required=True) + parser.add_argument("--tag", required=True) + parser.add_argument("--default-branch", required=True) + parser.add_argument("--version") args = parser.parse_args() try: - result = validate(Path.cwd(), args.line, args.tag, args.default_branch, args.version) + result = validate( + Path.cwd(), args.line, args.tag, args.default_branch, args.version + ) except (ValueError, KeyError, OSError, subprocess.CalledProcessError) as error: raise SystemExit(str(error)) from error - if os.environ.get('GITHUB_OUTPUT'): - with open(os.environ['GITHUB_OUTPUT'], 'a') as output: + if os.environ.get("GITHUB_OUTPUT"): + with open(os.environ["GITHUB_OUTPUT"], "a") as output: for key, value in result.items(): - output.write(f'{key}={value}\n') + output.write(f"{key}={value}\n") print(json.dumps(result, indent=2)) -if __name__ == '__main__': + +if __name__ == "__main__": main() diff --git a/scripts/test_release_line.py b/scripts/test_release_line.py index 00cd7ec..e1a8571 100644 --- a/scripts/test_release_line.py +++ b/scripts/test_release_line.py @@ -1,12 +1,14 @@ """Exercise the release boundary without installing or starting a robot node.""" + import os -from pathlib import Path import subprocess import tempfile import unittest +from pathlib import Path from check_release_line import validate + class ReleaseLineTests(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory() @@ -15,101 +17,123 @@ def setUp(self): old = Path.cwd() os.chdir(self.root) self.addCleanup(os.chdir, old) - self.git('init', '-b', 'main') - self.git('config', 'user.name', 'Release test') - self.git('config', 'user.email', 'release-test@example.invalid') - self.write(1, '1.0.0') - self.git('add', '.') - self.git('commit', '-qm', 'legacy line') - self.git('tag', '-a', 'v1.0.0', '-m', 'legacy') - self.git('update-ref', 'refs/remotes/origin/stable/1.x', 'HEAD') - self.legacy = self.git('rev-parse', 'HEAD') - self.write(2, '2.0.0') - self.git('add', '.') - self.git('commit', '-qm', 'current line') - self.git('tag', '-a', 'v2.0.0', '-m', 'current') - self.git('update-ref', 'refs/remotes/origin/main', 'HEAD') + self.git("init", "-b", "main") + self.git("config", "user.name", "Release test") + self.git("config", "user.email", "release-test@example.invalid") + self.write(1, "1.0.0") + self.git("add", ".") + self.git("commit", "-qm", "legacy line") + self.git("tag", "-a", "v1.0.0", "-m", "legacy") + self.git("update-ref", "refs/remotes/origin/stable/1.x", "HEAD") + self.legacy = self.git("rev-parse", "HEAD") + self.write(2, "2.0.0") + self.git("add", ".") + self.git("commit", "-qm", "current line") + self.git("tag", "-a", "v2.0.0", "-m", "current") + self.git("update-ref", "refs/remotes/origin/main", "HEAD") def git(self, *args): - return subprocess.check_output(['git', *args], text=True, stderr=subprocess.DEVNULL).strip() + return subprocess.check_output( + ["git", *args], text=True, stderr=subprocess.DEVNULL + ).strip() def write(self, major, version): - (self.root / 'pyproject.toml').write_text(f'[project]\nname="node"\nversion="{version}"\n[build-system]\nrequires=["hatchling"]\nbuild-backend="hatchling.build"\n') - dora = '0.4.1' if major == 1 else '1.0.1' - (self.root / 'uv.lock').write_text(f'[[package]]\nname="forge-msgs"\nversion="{major}.0.0"\n[[package]]\nname="dora-rs"\nversion="{dora}"\n') + (self.root / "pyproject.toml").write_text( + f'[project]\nname="node"\nversion="{version}"\n[build-system]\nrequires=["hatchling"]\nbuild-backend="hatchling.build"\n' + ) + dora = "0.4.1" if major == 1 else "1.0.1" + (self.root / "uv.lock").write_text( + f'[[package]]\nname="forge-msgs"\nversion="{major}.0.0"\n[[package]]\nname="dora-rs"\nversion="{dora}"\n' + ) def test_current_line(self): - self.assertEqual(validate(self.root, '2.x', 'v2.0.0', 'main')['package_kind'], 'python') + self.assertEqual( + validate(self.root, "2.x", "v2.0.0", "main")["package_kind"], "python" + ) def test_legacy_line(self): - self.git('checkout', '-q', 'v1.0.0') - self.assertEqual(validate(self.root, '1.x', 'v1.0.0', 'main')['version'], '1.0.0') + self.git("checkout", "-q", "v1.0.0") + self.assertEqual( + validate(self.root, "1.x", "v1.0.0", "main")["version"], "1.0.0" + ) def test_wrong_ancestry(self): - with self.assertRaisesRegex(ValueError, 'belong to stable'): - validate(self.root, '1.x', 'v2.0.0', 'main') + with self.assertRaisesRegex(ValueError, "belong to stable"): + validate(self.root, "1.x", "v2.0.0", "main") def test_incomplete_migration(self): - self.git('checkout', '-q', 'v1.0.0') - with self.assertRaisesRegex(ValueError, 'requires node/package version 2.x'): - validate(self.root, '2.x', 'v1.0.0', 'main') + self.git("checkout", "-q", "v1.0.0") + with self.assertRaisesRegex(ValueError, "requires node/package version 2.x"): + validate(self.root, "2.x", "v1.0.0", "main") def test_zero_version_needs_normalization(self): - self.git('checkout', '-q', 'v1.0.0') - self.write(1, '0.1.0') - self.git('add', '.') - self.git('commit', '-qm', 'legacy zero version') - self.git('tag', '-a', 'v0.1.0', '-m', 'zero') - self.git('update-ref', 'refs/remotes/origin/stable/1.x', 'HEAD') - with self.assertRaisesRegex(ValueError, 'normalize legacy 0.x'): - validate(self.root, '1.x', 'v0.1.0', 'main') + self.git("checkout", "-q", "v1.0.0") + self.write(1, "0.1.0") + self.git("add", ".") + self.git("commit", "-qm", "legacy zero version") + self.git("tag", "-a", "v0.1.0", "-m", "zero") + self.git("update-ref", "refs/remotes/origin/stable/1.x", "HEAD") + with self.assertRaisesRegex(ValueError, "normalize legacy 0.x"): + validate(self.root, "1.x", "v0.1.0", "main") def test_unrelated_tag(self): - self.git('checkout', '--orphan', 'unrelated') - self.git('commit', '-qm', 'unreviewed source') - self.git('tag', '-a', 'v2.0.1', '-m', 'unrelated') - with self.assertRaisesRegex(ValueError, 'belong to main'): - validate(self.root, '2.x', 'v2.0.1', 'main') + self.git("checkout", "--orphan", "unrelated") + self.git("commit", "-qm", "unreviewed source") + self.git("tag", "-a", "v2.0.1", "-m", "unrelated") + with self.assertRaisesRegex(ValueError, "belong to main"): + validate(self.root, "2.x", "v2.0.1", "main") def test_lightweight_tag(self): - self.git('tag', 'v2.0.1') - with self.assertRaisesRegex(ValueError, 'annotated'): - validate(self.root, '2.x', 'v2.0.1', 'main') + self.git("tag", "v2.0.1") + with self.assertRaisesRegex(ValueError, "annotated"): + validate(self.root, "2.x", "v2.0.1", "main") def test_wrong_checkout(self): - with self.assertRaisesRegex(ValueError, 'Checkout differs'): - validate(self.root, '2.x', 'v1.0.0', 'main') + with self.assertRaisesRegex(ValueError, "Checkout differs"): + validate(self.root, "2.x", "v1.0.0", "main") def test_version_mismatch(self): - with self.assertRaisesRegex(ValueError, 'requested version'): - validate(self.root, '2.x', 'v2.0.0', 'main', '2.0.1') - (self.root / 'pyproject.toml').write_text('[project]\nversion="2.0.1"\n') - with self.assertRaisesRegex(ValueError, 'source metadata'): - validate(self.root, '2.x', 'v2.0.0', 'main') + with self.assertRaisesRegex(ValueError, "requested version"): + validate(self.root, "2.x", "v2.0.0", "main", "2.0.1") + (self.root / "pyproject.toml").write_text('[project]\nversion="2.0.1"\n') + with self.assertRaisesRegex(ValueError, "source metadata"): + validate(self.root, "2.x", "v2.0.0", "main") def test_wrong_dora_and_missing_forge(self): - (self.root / 'uv.lock').write_text('[[package]]\nname="forge-msgs"\nversion="2.0.0"\n[[package]]\nname="dora-rs"\nversion="0.4.1"\n') - with self.assertRaisesRegex(ValueError, 'requires Dora'): - validate(self.root, '2.x', 'v2.0.0', 'main') - (self.root / 'uv.lock').write_text('package=[]\n') - with self.assertRaisesRegex(ValueError, 'resolved Forge'): - validate(self.root, '2.x', 'v2.0.0', 'main') + (self.root / "uv.lock").write_text( + '[[package]]\nname="forge-msgs"\nversion="2.0.0"\n[[package]]\nname="dora-rs"\nversion="0.4.1"\n' + ) + with self.assertRaisesRegex(ValueError, "requires Dora"): + validate(self.root, "2.x", "v2.0.0", "main") + (self.root / "uv.lock").write_text("package=[]\n") + with self.assertRaisesRegex(ValueError, "resolved Forge"): + validate(self.root, "2.x", "v2.0.0", "main") def test_rust_metadata(self): - (self.root / 'pyproject.toml').unlink() - (self.root / 'Cargo.toml').write_text('[package]\nname="node"\nversion="2.0.0"\n') - (self.root / 'Cargo.lock').write_text('[[package]]\nname="forge_msgs"\nversion="2.0.0"\n[[package]]\nname="dora-node-api"\nversion="1.0.1"\n') - self.assertEqual(validate(self.root, '2.x', 'v2.0.0', 'main')['package_kind'], 'source') + (self.root / "pyproject.toml").unlink() + (self.root / "Cargo.toml").write_text( + '[package]\nname="node"\nversion="2.0.0"\n' + ) + (self.root / "Cargo.lock").write_text( + '[[package]]\nname="forge_msgs"\nversion="2.0.0"\n[[package]]\nname="dora-node-api"\nversion="1.0.1"\n' + ) + self.assertEqual( + validate(self.root, "2.x", "v2.0.0", "main")["package_kind"], "source" + ) def test_core_family(self): - path = self.root / 'packages/msgs' + path = self.root / "packages/msgs" path.mkdir(parents=True) - (path / 'pyproject.toml').write_text('[project]\nversion="2.1.0"\n') - (self.root / 'versions.toml').write_text('[packages]\nmsgs="2.1.0"\n') - self.git('tag', '-a', 'forge-msgs-v2.1.0', '-m', 'msgs') - self.assertEqual(validate(self.root, '2.x', 'forge-msgs-v2.1.0', 'main')['package_kind'], 'family') - with self.assertRaisesRegex(ValueError, 'Use an existing'): - validate(self.root, '2.x', 'forge-unknown-v2.1.0', 'main') - -if __name__ == '__main__': + (path / "pyproject.toml").write_text('[project]\nversion="2.1.0"\n') + (self.root / "versions.toml").write_text('[packages]\nmsgs="2.1.0"\n') + self.git("tag", "-a", "forge-msgs-v2.1.0", "-m", "msgs") + self.assertEqual( + validate(self.root, "2.x", "forge-msgs-v2.1.0", "main")["package_kind"], + "family", + ) + with self.assertRaisesRegex(ValueError, "Use an existing"): + validate(self.root, "2.x", "forge-unknown-v2.1.0", "main") + + +if __name__ == "__main__": unittest.main()