ruyi 0.42.0b20251015__py3-none-any.whl → 0.43.0a20251017__py3-none-any.whl

ruyi/__main__.py

@@ -11,6 +11,7 @@ from ruyi.utils.global_mode import (
     TRUTHY_ENV_VAR_VALUES,
     is_env_var_truthy,
 )
+from ruyi.utils.node_info import probe_for_container_runtime
 
 # NOTE: no imports that directly or indirectly pull in pygit2 should go here,
 # because import of pygit2 will fail if done before ssl_patch. Notably this
@@ -32,6 +33,9 @@ def _is_allowed_to_run_as_root() -> bool:
         # CI environments are usually considered to be controlled, and safe
         # for root usage.
         return True
+    if probe_for_container_runtime(os.environ) != "unknown":
+        # So are container environments.
+        return True
     return False
 
 

ruyi/cli/main.py

@@ -6,6 +6,7 @@ from typing import Final, TYPE_CHECKING
 from ..config import GlobalConfig
 from ..telemetry.scope import TelemetryScope
 from ..utils.global_mode import GlobalModeProvider
+from ..version import RUYI_SEMVER
 from . import RUYI_ENTRYPOINT_NAME
 from .oobe import OOBE
 
@@ -22,7 +23,11 @@ def is_called_as_ruyi(argv0: str) -> bool:
 
 
 def should_prompt_for_renaming(argv0: str) -> bool:
-    return os.path.basename(argv0).lower().startswith(f"{RUYI_ENTRYPOINT_NAME}-")
+    # We need to allow things like "ruyi-qemu" through, to not break our mux.
+    # Only consider filenames starting with both our name *and* version to be
+    # un-renamed onefile artifacts that warrant a rename prompt.
+    likely_artifact_name_prefix = f"{RUYI_ENTRYPOINT_NAME}-{RUYI_SEMVER}."
+    return os.path.basename(argv0).lower().startswith(likely_artifact_name_prefix)
 
 
 def main(gm: GlobalModeProvider, gc: GlobalConfig, argv: list[str]) -> int:

ruyi/cli/oobe.py

@@ -65,7 +65,7 @@ class OOBE:
             handler()
 
     def _builtin_shell_completion_tip(self) -> None:
-        from ..telemetry.node_info import probe_for_shell
+        from ..utils.node_info import probe_for_shell
         from .completion import SUPPORTED_SHELLS
 
         # Only show the tip if we're not externally managed by a package manager,

ruyi/pluginhost/api.py

@@ -44,7 +44,7 @@ class RuyiHostAPI:
 
     @property
     def ruyi_version(self) -> str:
-        return str(RUYI_SEMVER)
+        return RUYI_SEMVER
 
     @property
     def ruyi_plugin_api_rev(self) -> int:

ruyi/telemetry/aggregate.py

@@ -3,8 +3,8 @@ from typing import Iterable, TypeAlias, TypedDict, TYPE_CHECKING
 if TYPE_CHECKING:
     from typing_extensions import NotRequired
 
+from ..utils.node_info import NodeInfo
 from .event import TelemetryEvent
-from .node_info import NodeInfo
 
 
 class AggregatedTelemetryEvent(TypedDict):

ruyi/telemetry/provider.py

@@ -8,7 +8,7 @@ from typing import Callable, TYPE_CHECKING, cast
 import uuid
 
 from ..log import RuyiLogger
-from .node_info import NodeInfo, gather_node_info
+from ..utils.node_info import NodeInfo, gather_node_info
 from .scope import TelemetryScope
 from .store import TelemetryStore
 

ruyi/telemetry/store.py

@@ -8,10 +8,10 @@ from typing import Callable, Final, Iterable
 import uuid
 
 from ..log import RuyiLogger
+from ..utils.node_info import NodeInfo
 from ..utils.url import urljoin_for_sure
 from .aggregate import UploadPayload, aggregate_events
 from .event import TelemetryEvent, is_telemetry_event
-from .node_info import NodeInfo
 from .scope import TelemetryScope
 
 # e.g. "run.202410201845.d06ca5d668e64fec833ed3e6eb926a2c.ndjson"
@@ -165,7 +165,7 @@ class TelemetryStore:
         payload: UploadPayload = {
             "fmt": 1,
             "nonce": payload_nonce,
-            "ruyi_version": str(RUYI_SEMVER),
+            "ruyi_version": RUYI_SEMVER,
             "events": aggregate_data,
         }
         if installation_data is not None:

ruyi/utils/global_mode.py

@@ -143,7 +143,7 @@ def _probe_cli_autocomplete(env: Mapping[str, str], argv: list[str]) -> bool:
         if arg.startswith("--output-completion-script"):
             return True
 
-    return "_ARGCOMPLETE" in os.environ
+    return "_ARGCOMPLETE" in env
 
 
 class EnvGlobalModeProvider(GlobalModeProvider):

ruyi/{telemetry → utils}/node_info.py

@@ -1,5 +1,6 @@
 import glob
 import os
+import pathlib
 import platform
 import re
 import subprocess
@@ -10,7 +11,7 @@ import uuid
 if TYPE_CHECKING:
     from typing_extensions import NotRequired
 
-from ..utils.ci import probe_for_ci
+from .ci import probe_for_ci
 
 
 class NodeInfo(TypedDict):
@@ -161,6 +162,56 @@ def probe_for_shell(os_environ: Mapping[str, str]) -> str:
     return "unknown"
 
 
+def probe_for_container_runtime(os_environ: Mapping[str, str]) -> str:
+    """Check if we are likely running in a container. Probes FS and environment
+    for signatures of known container runtimes."""
+
+    # check environment markers first
+
+    if "KUBERNETES_SERVICE_HOST" in os_environ:
+        return "kubernetes"
+
+    if "container" in os_environ:
+        v = os_environ["container"].lower()
+        if v == "oci":
+            return "other-oci-compliant"
+        # could be e.g. "lxc", "lxc-libvirt", "systemd-nspawn", etc.
+        return v
+
+    # check for filesystem markers
+
+    if os.path.exists("/run/.containerenv"):
+        return "podman"
+    # Docker must be checked after Podman
+    if os.path.exists("/.dockerenv"):
+        return "docker"
+
+    try:
+        v = pathlib.Path("/run/systemd/container").read_text(encoding="utf-8").strip()
+        if v:
+            return v.lower()
+    except Exception:
+        pass
+
+    if _probe_for_wsl():
+        return "wsl"
+
+    return "unknown"
+
+
+def _probe_for_wsl() -> bool:
+    if sys.platform != "linux":
+        return False
+    # http://github.com/Microsoft/WSL/issues/423#issuecomment-221627364
+    for path in ("/proc/sys/kernel/osrelease", "/proc/version"):
+        try:
+            ver = pathlib.Path(path).read_text(encoding="utf-8")
+        except Exception:
+            continue
+        return "Microsoft" in ver or "WSL" in ver
+    return False
+
+
 def gather_node_info(report_uuid: uuid.UUID | None = None) -> NodeInfo:
     arch = platform.machine()
     libc = probe_for_libc()

ruyi/version.py

@@ -1,53 +1,6 @@
-import importlib.metadata
-from typing import Final, TYPE_CHECKING
+from typing import Final
 
-import packaging.version
-
-if TYPE_CHECKING:
-    # pyright only works with semver 3.x
-    from semver.version import Version
-else:
-    try:
-        from semver.version import Version  # type: ignore[import-untyped,unused-ignore]
-    except ModuleNotFoundError:
-        # semver 2.x
-        from semver import VersionInfo as Version  # type: ignore[import-untyped,unused-ignore]
-
-# NOTE: one cannot print logs in the version helpers, because the version info
-# is initialized so early (before argparse can look at argv because --version
-# requires version info to be ready) that the porcelain status is not yet
-# available.
-
-_PYPI_PRERELEASE_KINDS_MAP: Final = {
-    "a": "alpha",
-    "b": "beta",
-    "rc": "rc",
-}
-
-
-# based on https://python-semver.readthedocs.io/en/3.0.2/advanced/convert-pypi-to-semver.html
-def _convert2semver(ver: packaging.version.Version) -> Version:
-    if ver.epoch:
-        raise ValueError("Can't convert an epoch to semver")
-    if ver.post:
-        raise ValueError("Can't convert a post part to semver")
-
-    pre: str | None = None
-    if ver.pre:
-        kind, val = ver.pre
-        pre = f"{_PYPI_PRERELEASE_KINDS_MAP.get(kind, kind)}.{val}"
-
-    maj, min, pat = ver.release[:3]
-    return Version(maj, min, pat, prerelease=pre, build=ver.dev)
-
-
-def _init_pkg_semver() -> Version:
-    pkg_pypi_ver = packaging.version.Version(importlib.metadata.version("ruyi"))
-    # log.D(f"PyPI-style version of ruyi: {pkg_pypi_ver}")
-    return _convert2semver(pkg_pypi_ver)
-
-
-RUYI_SEMVER: Final = _init_pkg_semver()
+RUYI_SEMVER: Final = "0.43.0-alpha.20251017"
 RUYI_USER_AGENT: Final = f"ruyi/{RUYI_SEMVER}"
 
 COPYRIGHT_NOTICE: Final = """\

{ruyi-0.42.0b20251015.dist-info → ruyi-0.43.0a20251017.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruyi
-Version: 0.42.0b20251015
+Version: 0.43.0a20251017
 Summary: Package manager for RuyiSDK
 License: Apache License
                                     Version 2.0, January 2004
@@ -225,7 +225,6 @@ Requires-Dist: argcomplete (>=2.0.0)
 Requires-Dist: arpy
 Requires-Dist: fastjsonschema (>=2.15.1)
 Requires-Dist: jinja2 (>=3,<4)
-Requires-Dist: packaging (>=21)
 Requires-Dist: pygit2 (>=1.6)
 Requires-Dist: pyyaml (>=5.4)
 Requires-Dist: requests (>=2,<3)

{ruyi-0.42.0b20251015.dist-info → ruyi-0.43.0a20251017.dist-info}/RECORD

@@ -1,13 +1,13 @@
 ruyi/__init__.py,sha256=_8k6Lm01mK35fGY7N9yQLF2SpmVPU70F2plkS6yG1YU,464
-ruyi/__main__.py,sha256=8oMhjGNQ5d9XMSKARupg9F4zprIGzTI8uExComP-EZc,3152
+ruyi/__main__.py,sha256=jgWWxLHU07JJQSRRqWWR3EcZpauqRpaJju9q3DF9yHg,3335
 ruyi/cli/__init__.py,sha256=MCdAZ00CLb9atln-pJrdQBmcrZmvPx4SOL5LVDbRc_Q,116
 ruyi/cli/builtin_commands.py,sha256=cYyPSF00DSBH1WMv6mHcMygbFRBGXObMWhbXHs5K1Mc,639
 ruyi/cli/cmd.py,sha256=kR3aEiDE3AfPoP0Zr7MO-09CKoExbkLLmPvve9oKaUg,6725
 ruyi/cli/completer.py,sha256=cnOkU7veDe-jP8ROXZL2uBop2HgWfaAZl6dromnPLx8,1426
 ruyi/cli/completion.py,sha256=ffLs3Dv7pY_uinwH98wkBPohRvAjpUOGqy01OTA_Bgo,841
 ruyi/cli/config_cli.py,sha256=9kq5W3Ir_lfwImhvrUmQ1KTKy1aRCv_UU1CmL5eGyJs,4038
-ruyi/cli/main.py,sha256=X1xyD7mYcCdQAWxGU7F27XPI77LzG0oifJx_el_UOBs,4124
-ruyi/cli/oobe.py,sha256=3m7oLPBhzn5JgagwQYDPy8vhZ4v8mBiDlO5n4cR_jVA,2712
+ruyi/cli/main.py,sha256=qWgCKbWG8sHxM7rInkoQfzZOHKo2k8JwdgJp_AMH388,4455
+ruyi/cli/oobe.py,sha256=TqXpoCAslIYt1ODPGial0NsNtf3nL1BLxJ8k_CdkuAU,2708
 ruyi/cli/self_cli.py,sha256=UEX3Xjy8RGGn9W2O5cM-5rLCwpsM7uSQ9vYYBYxyjyQ,8837
 ruyi/cli/user_input.py,sha256=ZJPyCAD7Aizkt37f_KDtW683aKvGZ2pL85Rg_y1LLfg,3711
 ruyi/cli/version_cli.py,sha256=L2pejZ7LIPYLUTb9NIz4t51KB8ai8igPBuE64tyqUuI,1275
@@ -28,7 +28,7 @@ ruyi/mux/venv/maker.py,sha256=RzipQWANOpKZxXGG_XiExyoQzHBw-j6wew7Iu6hZwZE,27234
 ruyi/mux/venv/venv_cli.py,sha256=rIKNcYKu1j7ahHXNgv_ytYVR7qJOoly-TaHPvb21FGA,2974
 ruyi/mux/venv_cfg.py,sha256=m75JCVLFWE1gE8OzcNDOHqwUc2c6ikJhZ-GhjsXv94U,6840
 ruyi/pluginhost/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ruyi/pluginhost/api.py,sha256=yu8zsvjGTFINwdwTQ6vGJPKQvb_9QHkbu8jpfoglNr4,5716
+ruyi/pluginhost/api.py,sha256=Zh69xJfR7PEbM6fjoFZRNqeqTneWAmC71NjA76HodSY,5711
 ruyi/pluginhost/ctx.py,sha256=MsP1L7nchnbSrauId3GaQzv0YJLnWE0u_H3ZFEmjUX8,6590
 ruyi/pluginhost/paths.py,sha256=3EVY3_i3LLff4Lk9py-E317C7_ysiRatfCiuxvCsVWw,4227
 ruyi/pluginhost/plugin_cli.py,sha256=rLdXG4_OJ2nlaSjFBmTaclx_N2f0s_Wi-9qcSeq7h9I,968
@@ -70,22 +70,22 @@ ruyi/ruyipkg/unpack.py,sha256=hPd-lOnDXp1lEb4mdbLUEckT4QXblSFxz-dGAdwaAjc,11207
 ruyi/ruyipkg/unpack_method.py,sha256=MonFFvcDb7MVsi2w4yitnCeZkmWmS7nRMMY-wSt9AMs,2106
 ruyi/ruyipkg/update_cli.py,sha256=ywsAAUPctJ3_2qPDvFL2__ql9m8tGZ6ZfrwbSk30Xh4,1425
 ruyi/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ruyi/telemetry/aggregate.py,sha256=Ybt25xrg0n62A9Ipslv18EBC-kLkyYsPeEzgguTtChg,1981
+ruyi/telemetry/aggregate.py,sha256=iKFC4re8IA69x8S-wXIGf5doN1C4zyNuyJulSI0xBTs,1988
 ruyi/telemetry/event.py,sha256=GZnFj6E59Q7mjp-2VRApAZH3rT_bu4_cWb5QMCPm-Zc,982
-ruyi/telemetry/node_info.py,sha256=ix-udhoKQI-HV7qVeEbd-jy3ZyhXL62sVA9uX4fowEg,5178
-ruyi/telemetry/provider.py,sha256=U88ydGga3dwYAi7mfNKmEEyfhAZ4xelF2L-jNAk29IY,16486
+ruyi/telemetry/provider.py,sha256=RTuGDddQ7yrD8wOlNOjyGhKydD7hiRe3f96pL3pOvmI,16493
 ruyi/telemetry/scope.py,sha256=e45VPAvRAqSxrL0ESorN9SCnR_I6Bwi2CMPJDDshJEE,1133
-ruyi/telemetry/store.py,sha256=7ThCzKF2txT_xU3qgjotOcwRqwNhozIkIyYQ0GSUxBg,8015
+ruyi/telemetry/store.py,sha256=O9YMlLL1iqDbW8ltq0aZRX4VBCZEexBbc335DqlPtRM,8017
 ruyi/telemetry/telemetry_cli.py,sha256=PBVMUSE3P6IBKQVMji_bueVenCdbchbOlowySXy0468,3364
 ruyi/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ruyi/utils/ar.py,sha256=w9wiYYdbInLewr5IRTcP0TiOw2ibVDQEmnV0hHm9WlA,2271
 ruyi/utils/ci.py,sha256=66DBm4ooA7yozDtXCJFd1n2jJXTsEnxPSpkNzLfE28M,2970
 ruyi/utils/frontmatter.py,sha256=4EOohEYCZ_q6ncpDv7ktJYf9PN4WEdgFfdE9hZBV3Zg,1052
 ruyi/utils/git.py,sha256=YspRRkfxLXluCv4LNx6q_mjkPdoX7WSM9aR7EfudqlM,5991
-ruyi/utils/global_mode.py,sha256=9Y17rVDm157EKvU6GJ8K1rnVTXnYyLN5e_7psObne00,5691
+ruyi/utils/global_mode.py,sha256=9GES5RyisSXAo14_bP896Jat6BFru_N-DC1V_7bofWY,5684
 ruyi/utils/l10n.py,sha256=l003oQ5M8fWIKQHbYTVSc6oHzFFGU2sbKac7Hh6FNFU,2530
 ruyi/utils/markdown.py,sha256=Mpq--ClM4j9lm_-5zO53ptYePUTLI4rg0V1YshOwsf8,2654
 ruyi/utils/mounts.py,sha256=31BGsVOpD2bO7PYpm8I1ogDHzP3MvrMWznKonS3Ajos,1210
+ruyi/utils/node_info.py,sha256=8-4dtrr2Ww_Cb9iKH_WpTMOWx7wknJKRwMUUZJYo9dQ,6603
 ruyi/utils/nuitka.py,sha256=7mdbmtKnUsGkIp1zxXgGWYrwZcCut3ipd0AP0DrbfZk,1112
 ruyi/utils/porcelain.py,sha256=pF6ieSE2xlnC0HBADFY0m-uuwVNNME3wlbHo2jWdLFA,1403
 ruyi/utils/prereqs.py,sha256=oWAaH-smpTMQxpHt782YBxqHxrTaheataslN988-a78,2076
@@ -94,9 +94,9 @@ ruyi/utils/templating.py,sha256=94xBJTkIfDqmUBTc9hnLO54zQoC7hwGWONGF3YbaqHk,966
 ruyi/utils/toml.py,sha256=aniIF3SGfR69_s3GWWwlnoKxW4B5IDVY2CM0eUI55_c,3501
 ruyi/utils/url.py,sha256=Wyct6syS4GmZC6mY7SK-YgBWxKl3cOOBXtp9UtvGkto,186
 ruyi/utils/xdg_basedir.py,sha256=RwVH199jPcLVsg5ngR62RaNS5hqnMpkdt31LqkCfa1g,2751
-ruyi/version.py,sha256=KLJkvKexU07mu-GVDbYKsQvReRvwlVFYkRmcvnyfQNY,2142
-ruyi-0.42.0b20251015.dist-info/METADATA,sha256=Vnf_Iz2GTrXASMxQRLxuLudTd_GNAwZ3wrdVKpwJF34,24275
-ruyi-0.42.0b20251015.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-ruyi-0.42.0b20251015.dist-info/entry_points.txt,sha256=GXSNSy7OgFrnlU5xm5dE3l3PGO92Qf6VDIUCdvQNm8E,49
-ruyi-0.42.0b20251015.dist-info/licenses/LICENSE-Apache.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ruyi-0.42.0b20251015.dist-info/RECORD,,
+ruyi/version.py,sha256=j8Z7zk9JhLLxMr6POPm4uSQ26tx7dasPlCI_S9rd2v8,610
+ruyi-0.43.0a20251017.dist-info/METADATA,sha256=Ka8_1dEj5TUsi7eFeUPj-XbfVhpzouC92b92z_k_cmI,24243
+ruyi-0.43.0a20251017.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ruyi-0.43.0a20251017.dist-info/entry_points.txt,sha256=GXSNSy7OgFrnlU5xm5dE3l3PGO92Qf6VDIUCdvQNm8E,49
+ruyi-0.43.0a20251017.dist-info/licenses/LICENSE-Apache.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ruyi-0.43.0a20251017.dist-info/RECORD,,