Skip to content

Commit cadb682

Browse files
authored
Merge pull request #45 from NVIDIA/johnny/oar-release-tags
Namespace OAR release tags
2 parents 567ad31 + ddf3cb0 commit cadb682

5 files changed

Lines changed: 13 additions & 9 deletions

File tree

AGENTS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ read `docs/development/index.md`.
3434
workflow is documented; regenerate exports with `uv`, never by hand.
3535
- Never commit credentials or populated `.env` files. Document configuration in
3636
`.env.example`.
37+
- Namespace release tags with a project label so versions from different
38+
projects do not collide. OpenShell Agent Runner tags use `oar-vX.Y.Z`.
3739
- Do not hand-edit generated Dev Notes cards, bylines, or navigation; use
3840
`python3 scripts/render-dev-notes.py`.
3941
- Do not hand-edit generated project-documentation mirrors under

projects/openshell-agent-runner/RELEASING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Releasing openshell-agent-runner
22

3-
The release process publishes to PyPI from a local shell. A version tag supplies
4-
the package version, and `uv publish` uploads the built distributions.
3+
The release process publishes to PyPI from a local shell. An OAR-namespaced
4+
version tag (`oar-vX.Y.Z`) supplies the package version, and `uv publish` uploads
5+
the built distributions.
56

67
Set a PyPI API token in the shell before publishing:
78

@@ -52,7 +53,7 @@ The script:
5253
1. Fetches `origin/main` and tags and confirms that local `main` is current.
5354
2. Runs the same checks and builds version `0.1.0` from the local tag.
5455
3. Checks the exact wheel and source distribution with `uv publish --dry-run`.
55-
4. Pushes `v0.1.0`, establishing the public source commit before publication.
56+
4. Pushes `oar-v0.1.0`, establishing the public source commit before publication.
5657
5. Uploads only those two artifacts to PyPI with `uv publish`.
5758
6. Prints the version-specific PyPI project link.
5859

projects/openshell-agent-runner/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ source = "uv-dynamic-versioning"
5151
[tool.uv-dynamic-versioning]
5252
vcs = "git"
5353
style = "pep440"
54+
pattern-prefix = "oar-"
5455
bump = true
5556

5657
[tool.hatch.build.targets.wheel]

projects/openshell-agent-runner/scripts/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ if [[ "$CURRENT_BRANCH" != "main" && "$ALLOW_NON_MAIN" != true ]]; then
8686
exit 1
8787
fi
8888

89-
TAG="v$VERSION"
89+
TAG="oar-v$VERSION"
9090
git fetch origin main --tags
9191

9292
if [[ "$ALLOW_NON_MAIN" != true ]] && \

projects/openshell-agent-runner/tests/test_release.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_publish_prints_tag_deletion_commands_for_existing_remote_tag(
3636
if [[ "$1" == "rev-parse" ]]; then printf 'abc123\\n'; exit 0; fi
3737
if [[ "$1" == "rev-list" ]]; then printf 'abc123\\n'; exit 0; fi
3838
if [[ "$1" == "ls-remote" ]]; then
39-
printf 'abc123\\trefs/tags/v0.1.0\\n'
39+
printf 'abc123\\trefs/tags/oar-v0.1.0\\n'
4040
exit 0
4141
fi
4242
exit 91
@@ -54,9 +54,9 @@ def test_publish_prints_tag_deletion_commands_for_existing_remote_tag(
5454
)
5555

5656
assert result.returncode == 1
57-
assert "remote tag 'v0.1.0' already exists" in result.stderr
58-
assert "git tag -d 'v0.1.0'" in result.stderr
59-
assert "git push origin --delete 'v0.1.0'" in result.stderr
57+
assert "remote tag 'oar-v0.1.0' already exists" in result.stderr
58+
assert "git tag -d 'oar-v0.1.0'" in result.stderr
59+
assert "git push origin --delete 'oar-v0.1.0'" in result.stderr
6060

6161

6262
@pytest.mark.parametrize(
@@ -94,7 +94,7 @@ def test_publish_retry_uploads_only_missing_artifacts(
9494
if [[ "$1" == "rev-list" ]]; then printf 'abc123\\n'; exit 0; fi
9595
if [[ "$1" == "ls-remote" ]]; then
9696
if [[ -e "$FAKE_GIT_STATE/remote-tag" ]]; then
97-
printf 'abc123\\trefs/tags/v0.1.0\\n'
97+
printf 'abc123\\trefs/tags/oar-v0.1.0\\n'
9898
fi
9999
exit 0
100100
fi

0 commit comments

Comments
 (0)