ruyi 0.42.0b20251015__tar.gz → 0.42.0b20251017__tar.gz

{ruyi-0.42.0b20251015 → ruyi-0.42.0b20251017}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruyi
-Version: 0.42.0b20251015
+Version: 0.42.0b20251017
 Summary: Package manager for RuyiSDK
 License: Apache License
                                     Version 2.0, January 2004

{ruyi-0.42.0b20251015 → ruyi-0.42.0b20251017}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "ruyi"
-version = "0.42.0-beta.20251015"
+version = "0.42.0-beta.20251017"
 description = "Package manager for RuyiSDK"
 keywords = ["ruyi", "ruyisdk"]
 license = { file = "LICENSE-Apache.txt" }

{ruyi-0.42.0b20251015 → ruyi-0.42.0b20251017}/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.42.0b20251017}/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.42.0b20251017}/ruyi/telemetry/store.py

@@ -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.0b20251017/ruyi/version.py

@@ -0,0 +1,20 @@
+from typing import Final
+
+RUYI_SEMVER: Final = "0.42.0-beta.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
-\
-"""