You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Brings the 41 commits that landed on main since the branch point (Jun 12):
CI/renovate/container configs, the new jumpstarter-driver-obd, sdwire/flashers/ble
driver updates, JEP-0014 docs, and Go-controller deploy changes — all of which are
orthogonal to the Rust rewrite and merged cleanly.
Conflict resolution (our Rust rewrite supersedes the Python these patches touched):
- exporter/hooks.py, hooks_test.py, client/lease.py, common/utils_test.py: kept
deleted (hooks, lease lifecycle, and shell launching are owned by the Rust core).
- common/utils.py, utils/env.py: kept ours (thin client; utils/env.py retains the
#53 ExporterMetadata/env_with_metadata helper ported in the previous commit).
- config/env.py: union of both (JMP_EXPORTER/JMP_EXPORTER_LABELS + JMP_LEASE).
- python/Makefile: kept both new .PHONY targets (sync-native + test-report).
- uv.lock: regenerated from the merged pyprojects.
The two main patches that DID touch rewritten logic were hand-ported first: #53
(exporter-context shell env vars) and #823 (hooks endLease release, already satisfied).
Verified: 128 Python tests pass across core + the merged drivers; no dangling
references to the deleted modules; uv sync reconciles the env (obd installed).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
0 commit comments