fix: round-5 CI backlog after the 779-commit main merge
Merge fallout (my resolution errors, all caught by CI): - hermes_cli/backup.py + gateway.py: `theirs` on those hunks re-imported clusters HEAD had already moved to backup_restore.py / kept in the facade. backup.py loses the 349-line duplicate (main's #110179 fix is ported into backup_restore._import_db_member); the systemd service-unit cluster returns to gateway.py (PM's _prepare_service_launcher / _pm_managed_node_dirs / _systemd_command have no home in main's extraction) with main's utf-8-sig read. gateway_service_unit.py is dropped. - gateway/run.py: main's plugin-update chore is not profile-scoped (the housekeeping ordering test pins the scope/drain sequence). - pyproject + 30 test files: `import yaml` -> `import hermes_yaml as yaml` (pm-clean has no pyyaml); gateway/config._bundled_platform_manifest_name reads through hermes_yaml. - tests re-seamed onto pm-clean's shape: residency admission (installed_engine), supervisor child env (binary is a constructor argument), update import guard (update_cmd_deps is gone; our probe already scrubs PYTHONPATH — both #115032 invariants pass), shallow-count git responses (stash path asks `status --porcelain -z`); dropped tests for retired code (_run_node_bootstrap/_ensure_tui_node, Windows resume demotion). - tests/tools/test_local_env_blocklist.py: restore the two helpers the suite-reduction commit dropped and the blocklist import. Real fixes: - pm: classify_uv_failure/ResolutionConflict move beside the uv runner (pm.environment, stdlib-only). pm.workspace imports tomllib at module level and cannot load on the 3.10 bootstrap python that streams uv output in the Docker arm64 image. - tools/browser_tool.warm_agent_browser_npx_cache: back as a permanent definition — it is on the frozen old-updater surface, and the revert-scheduled compat pointer does not count. - hermes_cli/memory_setup: the dashboard's pip row uses pm.environments. running_from_selected_environment for installed vs restart_required. - scripts/windows-build-deps.ps1: export DISTUTILS_USE_SDK/MSSdk so setuptools trusts the primed MSVC environment instead of asking vswhere (`env -i` test runner on win32-arm64 compiling ruamel-yaml-clib); run_tests.sh forwards them. - tests/pm/test_windows_build_deps.py: start the protocol test from a parent env without the toolchain variables the runner job already exports. - tests/conftest.py scrubs HERMES_BUNDLED_PLUGINS (Nix-wrapped hermes on the dev host); tests/home_io_guard.py treats sys.path site-packages under the real home as the interpreter's installation (PM-activated developer shell). - tests-js: four `curly` lint errors from main's new scripts.
This commit is contained in:
@@ -27,26 +27,10 @@ def _member_ignored(directory, names):
|
||||
return [name for name in names if name in _MEMBER_EXCLUDE or name.endswith(".egg-info")]
|
||||
|
||||
|
||||
class ResolutionConflict(InstallError):
|
||||
"""uv's resolver proved the union has no valid solution."""
|
||||
|
||||
|
||||
# Markers uv prints ONLY when the resolver itself proves no solution
|
||||
# exists (its conflict report: "Because ...", "no solution found").
|
||||
from pm.environment import _RESOLVER_MARKERS # noqa: E402 — defined beside the uv runner
|
||||
|
||||
|
||||
def classify_uv_failure(stage: str, returncode: int, output: str) -> InstallError:
|
||||
"""Turn a failed `uv <stage>` into the right classified error.
|
||||
|
||||
Resolver-conflict output → ResolutionConflict; anything else (fetch,
|
||||
build, tooling) → plain InstallError with the tail of the output.
|
||||
"""
|
||||
cause = f"uv {stage} exited {returncode}: {output.strip()[-600:]}"
|
||||
lowered = output.lower()
|
||||
if any(marker in lowered for marker in _RESOLVER_MARKERS):
|
||||
return ResolutionConflict("venv", cause)
|
||||
return InstallError("venv", cause)
|
||||
# The uv failure classifier lives beside the uv runner (stdlib-only imports): the bootstrap
|
||||
# runner streams uv output from a pre-3.11 system python where this module's tomllib import
|
||||
# cannot load. Workspace callers keep reaching it from here.
|
||||
from pm.environment import ResolutionConflict, classify_uv_failure # noqa: E402,F401
|
||||
|
||||
|
||||
def member_sources(plugin_dirs) -> dict[Path, Path]:
|
||||
|
||||
Reference in New Issue
Block a user