Skip to content

Commit 16e7f7e

Browse files
Merge remote-tracking branch 'origin/main' into test/5296-credential-gating-pilot/matthewgrossman
Signed-off-by: Matthew Grossman <[email protected]>
2 parents 6ebaf4d + 9977edc commit 16e7f7e

46 files changed

Lines changed: 917 additions & 782 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/release-captain/SKILL.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ git worktree remove --force "$wt"
169169
```
170170

171171
4. **Watch and verify.** Check that `Select Qualified Prerelease` names the
172-
approved candidate, the GitHub Release has assets, no job failed, and the
173-
wheel reached PyPI:
172+
approved candidate, the GitHub Release has assets and no job failed:
174173

175174
```shell
176175
gh run watch <run-id> --exit-status

‎.agents/skills/release-openshell/SKILL.md‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Release creates `vX.Y.Z` at that exact commit, then rebuilds and publishes all
3333
stable artifacts without rerunning qualification. Embedded versions change, so
3434
stable artifacts are not byte-identical to the qualified prerelease. An existing
3535
stable tag may be retried only if it already points to the selected commit. A retry
36-
publishes only missing artifacts; published images, charts, release assets, npm,
37-
and PyPI versions are kept, while the snap is uploaded again.
36+
publishes only missing artifacts; published images, charts, release assets, and
37+
npm versions are kept, while the snap is uploaded again.
3838
Stable images are saved as OCI archives during the build and pushed under the
3939
stable version tags during publication. Their SBOMs are verified before updating
4040
`latest`; the qualified prerelease's commit-SHA image tags remain unchanged.
@@ -84,17 +84,6 @@ immutable version and advance latest only for a newer version.
8484

8585
Watch the stable release run and report its result.
8686

87-
## PyPI publishing
87+
## Python SDK
8888

89-
Stable releases publish the Python wheel to PyPI from `wheel-publish.yml`, which the `publish-pypi` job in `release-publish.yml` calls after the GitHub Release is created. The workflow downloads the wheel from the stable GitHub Release, not a run's build artifact, and checks the stable tag's source commit and the wheel's release checksum. It uses Trusted Publishing with the `pypi` GitHub environment. PyPI matches the workflow file that contains the publishing job, so configure the `openshell` PyPI project's GitHub publisher with owner `NVIDIA`, repository `OpenShell`, workflow `wheel-publish.yml`, and environment `pypi`. No PyPI API token or GitLab trigger credentials are required.
90-
91-
The environment must allow the branch used to dispatch Release or `wheel-publish.yml`. For a support release, explicitly allow its support branch before dispatching. Required reviewers, if configured, must approve the PyPI job. An existing wheel on PyPI is skipped; PyPI does not allow replacing a published wheel.
92-
93-
If a stable release did not reach PyPI, publish the wheel without rerunning Release:
94-
95-
```shell
96-
gh workflow run wheel-publish.yml -R NVIDIA/OpenShell --ref main \
97-
-f release-tag=vX.Y.Z -f source-sha=<tag commit> -f python-version=X.Y.Z
98-
```
99-
100-
Development and prerelease wheels remain GitHub Release assets and do not publish to PyPI.
89+
Core no longer builds or publishes the Python SDK for releases. The stable, prerelease, and rolling `dev` GitHub Releases carry no wheel, and nothing in core publishes to PyPI. `openshell` `0.1.7` is the last core-built wheel. From `0.1.8` on, [ai-openshell/sdk-python](https://github.com/ai-openshell/sdk-python) publishes `openshell` on the same day as each stable core release, once its update PR for the core tag merges.

‎.github/workflows/branch-checks.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,9 @@ jobs:
598598
- name: Test
599599
run: mise run test:python
600600

601+
- name: Test Python scripts
602+
run: mise run test:python-scripts
603+
601604
- name: Test local gateway configuration helpers
602605
run: |
603606
bash tasks/scripts/test-gateway-pull-policy.sh
@@ -638,6 +641,41 @@ jobs:
638641
echo "$changed"
639642
exit 1
640643
644+
python-sdk-freeze:
645+
# The Python SDK moved to ai-openshell/sdk-python (#5287), which imported it
646+
# at v0.1.7. Its files stay only until core removes them, so PRs must not
647+
# add or change them. Deleting files is allowed (the removal PR). The paths
648+
# are the ones the import moved: all of python/ plus the two SDK build
649+
# scripts. The shared root pyproject.toml and uv.lock stay editable.
650+
# Merge queue runs skip this job; the PR already passed it on its mirror.
651+
name: Python SDK Freeze
652+
needs: pr_metadata
653+
if: needs.pr_metadata.outputs.should_run == 'true' && github.event_name == 'push'
654+
runs-on: ubuntu-latest
655+
timeout-minutes: 5
656+
steps:
657+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
658+
with:
659+
fetch-depth: 0
660+
persist-credentials: false
661+
662+
- name: Reject changes to the Python SDK
663+
env:
664+
BASE_SHA: ${{ needs.pr_metadata.outputs.base_sha }}
665+
run: |
666+
set -euo pipefail
667+
changed=$(git diff --name-only --diff-filter=d "${BASE_SHA}...HEAD" -- \
668+
python \
669+
tasks/scripts/generate_python_proto.py)
670+
if [ -z "$changed" ]; then
671+
echo "No added or changed Python SDK files."
672+
exit 0
673+
fi
674+
echo "::error title=Python SDK moved::The Python SDK moved to https://github.com/ai-openshell/sdk-python. Drop the Python SDK changes from this PR and open SDK changes there. Regenerated bindings are not needed here; sdk-python regenerates them from core releases."
675+
echo "Changed Python SDK files:"
676+
echo "$changed"
677+
exit 1
678+
641679
markdown:
642680
name: Markdown
643681
needs: pr_metadata

0 commit comments

Comments
 (0)