ruyi 0.42.0b20251017__tar.gz → 0.43.0a20251017__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruyi
-Version: 0.42.0b20251017
+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.0b20251017 → ruyi-0.43.0a20251017}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "ruyi"
-version = "0.42.0-beta.20251017"
+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.0b20251017 → 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.0b20251017 → 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.0b20251017 → 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.0b20251017 → 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.0b20251017 → 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"

{ruyi-0.42.0b20251017 → 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.0b20251017/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.42.0b20251017 → ruyi-0.43.0a20251017}/ruyi/version.py

@@ -1,6 +1,6 @@
 from typing import Final
 
-RUYI_SEMVER: Final = "0.42.0-beta.20251017"
+RUYI_SEMVER: Final = "0.43.0-alpha.20251017"
 RUYI_USER_AGENT: Final = f"ruyi/{RUYI_SEMVER}"
 
 COPYRIGHT_NOTICE: Final = """\