ruyi 0.42.0b20251015__tar.gz → 0.43.0a20251017__tar.gz

{ruyi-0.42.0b20251015 → ruyi-0.43.0a20251017}/PKG-INFO

@@ -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 → ruyi-0.43.0a20251017}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "ruyi"
-version = "0.42.0-beta.20251015"
+version = "0.43.0-alpha.20251017"
 description = "Package manager for RuyiSDK"
 keywords = ["ruyi", "ruyisdk"]
 license = { file = "LICENSE-Apache.txt" }
@@ -33,7 +33,6 @@ dependencies = [
   "arpy",
   "fastjsonschema>=2.15.1",
   "jinja2 (>=3, <4)",
-  "packaging>=21",
   "pygit2>=1.6",
   "pyyaml>=5.4",
   "requests (>=2, <3)",

{ruyi-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015 → ruyi-0.43.0a20251017}/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-0.42.0b20251015/ruyi/telemetry → ruyi-0.43.0a20251017/ruyi/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-0.43.0a20251017/ruyi/version.py

@@ -0,0 +1,20 @@
+from typing import Final
+
+RUYI_SEMVER: Final = "0.43.0-alpha.20251017"
+RUYI_USER_AGENT: Final = f"ruyi/{RUYI_SEMVER}"
+
+COPYRIGHT_NOTICE: Final = """\
+Copyright (C) Institute of Software, Chinese Academy of Sciences (ISCAS).
+All rights reserved.
+License: Apache-2.0 <https://www.apache.org/licenses/LICENSE-2.0>
+\
+"""
+
+MPL_REDIST_NOTICE: Final = """\
+This distribution of ruyi contains code licensed under the Mozilla Public
+License 2.0 (https://mozilla.org/MPL/2.0/). You can get the respective
+project's sources from the project's official website:
+
+* certifi: https://github.com/certifi/python-certifi
+\
+"""

ruyi-0.42.0b20251015/ruyi/version.py

@@ -1,67 +0,0 @@
-import importlib.metadata
-from typing import Final, TYPE_CHECKING
-
-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_USER_AGENT: Final = f"ruyi/{RUYI_SEMVER}"
-
-COPYRIGHT_NOTICE: Final = """\
-Copyright (C) Institute of Software, Chinese Academy of Sciences (ISCAS).
-All rights reserved.
-License: Apache-2.0 <https://www.apache.org/licenses/LICENSE-2.0>
-\
-"""
-
-MPL_REDIST_NOTICE: Final = """\
-This distribution of ruyi contains code licensed under the Mozilla Public
-License 2.0 (https://mozilla.org/MPL/2.0/). You can get the respective
-project's sources from the project's official website:
-
-* certifi: https://github.com/certifi/python-certifi
-\
-"""