ruyi 0.42.0b20251015__py3-none-any.whl → 0.42.0b20251017__py3-none-any.whl

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/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/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/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.42.0-beta.20251017"
 RUYI_USER_AGENT: Final = f"ruyi/{RUYI_SEMVER}"
 
 COPYRIGHT_NOTICE: Final = """\

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

@@ -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.dist-info → ruyi-0.42.0b20251017.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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/main.py,sha256=qWgCKbWG8sHxM7rInkoQfzZOHKo2k8JwdgJp_AMH388,4455
 ruyi/cli/oobe.py,sha256=3m7oLPBhzn5JgagwQYDPy8vhZ4v8mBiDlO5n4cR_jVA,2712
 ruyi/cli/self_cli.py,sha256=UEX3Xjy8RGGn9W2O5cM-5rLCwpsM7uSQ9vYYBYxyjyQ,8837
 ruyi/cli/user_input.py,sha256=ZJPyCAD7Aizkt37f_KDtW683aKvGZ2pL85Rg_y1LLfg,3711
@@ -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
@@ -75,7 +75,7 @@ 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/scope.py,sha256=e45VPAvRAqSxrL0ESorN9SCnR_I6Bwi2CMPJDDshJEE,1133
-ruyi/telemetry/store.py,sha256=7ThCzKF2txT_xU3qgjotOcwRqwNhozIkIyYQ0GSUxBg,8015
+ruyi/telemetry/store.py,sha256=jodRQ7aRye9qYfvc0uaPQ5DLYGmYYuJtb8dnUN9KVs8,8010
 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
@@ -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=jfXW6Hdr5S82pdnYx3yiOp2U6a_gnDBLlnwUniBvFeA,609
+ruyi-0.42.0b20251017.dist-info/METADATA,sha256=DBFusreF_Vtb5LUPcgyo958WIevmFQn2yBOVz3aNexs,24275
+ruyi-0.42.0b20251017.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ruyi-0.42.0b20251017.dist-info/entry_points.txt,sha256=GXSNSy7OgFrnlU5xm5dE3l3PGO92Qf6VDIUCdvQNm8E,49
+ruyi-0.42.0b20251017.dist-info/licenses/LICENSE-Apache.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ruyi-0.42.0b20251017.dist-info/RECORD,,