ruyi 0.45.0__tar.gz → 0.45.0a20251230__tar.gz

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ruyi
-Version: 0.45.0
+Version: 0.45.0a20251230
 Summary: Package manager for RuyiSDK
 License: Apache License
                                     Version 2.0, January 2004
@@ -224,7 +224,6 @@ Classifier: Topic :: System :: Software Distribution
 Classifier: Typing :: Typed
 Requires-Dist: argcomplete (>=2.0.0)
 Requires-Dist: arpy
-Requires-Dist: babel (>=2.8.0)
 Requires-Dist: fastjsonschema (>=2.15.1)
 Requires-Dist: jinja2 (>=3,<4)
 Requires-Dist: pygit2 (>=1.6) ; python_version >= "3.11"

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "ruyi"
-version = "0.45.0"
+version = "0.45.0-alpha.20251230"
 description = "Package manager for RuyiSDK"
 keywords = ["ruyi", "ruyisdk"]
 license = { file = "LICENSE-Apache.txt" }
@@ -32,7 +32,6 @@ requires-python = ">=3.10"
 dependencies = [
   "argcomplete>=2.0.0",
   "arpy",
-  "babel>=2.8.0",
   "fastjsonschema>=2.15.1",
   "jinja2 (>=3, <4)",
   "pygit2 (>=1.6, <1.19); python_version<'3.11'",

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/__main__.py

@@ -1,11 +1,9 @@
 #!/usr/bin/env python3
 
 import os
-import pathlib
 import sys
 
 import ruyi
-from ruyi.i18n import _, ADAPTER
 from ruyi.utils.ci import is_running_in_ci
 from ruyi.utils.global_mode import (
     EnvGlobalModeProvider,
@@ -43,8 +41,6 @@ def _is_allowed_to_run_as_root() -> bool:
 
 def entrypoint() -> None:
     gm = EnvGlobalModeProvider(os.environ, sys.argv)
-    ADAPTER.init_from_env(os.environ)
-    ADAPTER.hook()
 
     # NOTE: import of `ruyi.log` takes ~90ms on my machine, so initialization
     # of logging is deferred as late as possible
@@ -54,16 +50,11 @@ def entrypoint() -> None:
 
         logger = RuyiConsoleLogger(gm)
 
-        logger.F(_("refusing to run as super user outside CI without explicit consent"))
+        logger.F("refusing to run as super user outside CI without explicit consent")
 
         choices = ", ".join(f"'{x}'" for x in TRUTHY_ENV_VAR_VALUES)
         logger.I(
-            _(
-                "re-run with environment variable [yellow]{env_var}[/] set to one of [yellow]{choices}[/] to signify consent"
-            ).format(
-                env_var=ENV_FORCE_ALLOW_ROOT,
-                choices=choices,
-            )
+            f"re-run with environment variable [yellow]{ENV_FORCE_ALLOW_ROOT}[/] set to one of [yellow]{choices}[/] to signify consent"
         )
         sys.exit(1)
 
@@ -72,7 +63,7 @@ def entrypoint() -> None:
 
         logger = RuyiConsoleLogger(gm)
 
-        logger.F(_("no argv?"))
+        logger.F("no argv?")
         sys.exit(1)
 
     if gm.is_packaged and ruyi.__compiled__.standalone:
@@ -94,11 +85,8 @@ def entrypoint() -> None:
     #
     # we assume the one-file build if Nuitka is detected; sys.argv[0] does NOT
     # work if it's just `ruyi` so we have to check our parent process in that case
+    self_exe = get_nuitka_self_exe() if gm.is_packaged else __file__
     sys.argv[0] = get_argv0()
-    if gm.is_packaged:
-        self_exe = get_nuitka_self_exe()
-    else:
-        self_exe = str(pathlib.Path(sys.argv[0]).resolve())
     gm.record_self_exe(sys.argv[0], __file__, self_exe)
 
     from ruyi.config import GlobalConfig

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/cli/cmd.py

@@ -1,7 +1,6 @@
 import argparse
 from typing import Callable, IO, Protocol, TYPE_CHECKING
 
-from ..i18n import _
 from . import RUYI_ENTRYPOINT_NAME
 
 if TYPE_CHECKING:
@@ -115,7 +114,7 @@ class BaseCommand:
             return
 
         sp = p.add_subparsers(
-            title=_("subcommands"),
+            title="subcommands",
             required=cls.is_subcommand_required,
         )
         for subcmd_cls in cls.parsers:
@@ -159,7 +158,7 @@ class RootCommand(
     has_subcommands=True,
     has_main=True,
     prog=RUYI_ENTRYPOINT_NAME,
-    description=_("RuyiSDK Package Manager"),
+    description="RuyiSDK Package Manager",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:
@@ -171,12 +170,12 @@ class RootCommand(
             action="store_const",
             dest="func",
             const=cli_version,
-            help=_("Print version information"),
+            help="Print version information",
         )
         p.add_argument(
             "--porcelain",
             action="store_true",
-            help=_("Give the output in a machine-friendly format if applicable"),
+            help="Give the output in a machine-friendly format if applicable",
         )
 
         # https://github.com/python/cpython/issues/67037 prevents the registration
@@ -220,7 +219,7 @@ class AdminCommand(
     has_subcommands=True,
     # https://github.com/python/cpython/issues/67037
     # help=argparse.SUPPRESS,
-    help=_("(NOT FOR REGULAR USERS) Subcommands for managing Ruyi repos"),
+    help="(NOT FOR REGULAR USERS) Subcommands for managing Ruyi repos",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/cli/config_cli.py

@@ -1,7 +1,6 @@
 import argparse
 from typing import TYPE_CHECKING
 
-from ..i18n import _
 from .cmd import RootCommand
 
 if TYPE_CHECKING:
@@ -14,7 +13,7 @@ class ConfigCommand(
     RootCommand,
     cmd="config",
     has_subcommands=True,
-    help=_("Manage Ruyi's config options"),
+    help="Manage Ruyi's config options",
 ):
     @classmethod
     def configure_args(
@@ -28,7 +27,7 @@ class ConfigCommand(
 class ConfigGetCommand(
     ConfigCommand,
     cmd="get",
-    help=_("Query the value of a Ruyi config option"),
+    help="Query the value of a Ruyi config option",
 ):
     @classmethod
     def configure_args(
@@ -39,7 +38,7 @@ class ConfigGetCommand(
         p.add_argument(
             "key",
             type=str,
-            help=_("The Ruyi config option to query"),
+            help="The Ruyi config option to query",
         )
 
     @classmethod
@@ -67,7 +66,7 @@ class ConfigGetCommand(
 class ConfigSetCommand(
     ConfigCommand,
     cmd="set",
-    help=_("Set the value of a Ruyi config option"),
+    help="Set the value of a Ruyi config option",
 ):
     @classmethod
     def configure_args(
@@ -78,12 +77,12 @@ class ConfigSetCommand(
         p.add_argument(
             "key",
             type=str,
-            help=_("The Ruyi config option to set"),
+            help="The Ruyi config option to set",
         )
         p.add_argument(
             "value",
             type=str,
-            help=_("The value to set the option to"),
+            help="The value to set the option to",
         )
 
     @classmethod
@@ -101,9 +100,7 @@ class ConfigSetCommand(
                 ed.set_value(key, pyval)
             except ProtectedGlobalConfigError:
                 cfg.logger.F(
-                    _(
-                        "the config [yellow]{key}[/] is protected and not meant to be overridden by users"
-                    ).format(key=key)
+                    f"the config [yellow]{key}[/] is protected and not meant to be overridden by users",
                 )
                 return 2
 
@@ -115,7 +112,7 @@ class ConfigSetCommand(
 class ConfigUnsetCommand(
     ConfigCommand,
     cmd="unset",
-    help=_("Unset a Ruyi config option"),
+    help="Unset a Ruyi config option",
 ):
     @classmethod
     def configure_args(
@@ -126,7 +123,7 @@ class ConfigUnsetCommand(
         p.add_argument(
             "key",
             type=str,
-            help=_("The Ruyi config option to unset"),
+            help="The Ruyi config option to unset",
         )
 
     @classmethod
@@ -145,7 +142,7 @@ class ConfigUnsetCommand(
 class ConfigRemoveSectionCommand(
     ConfigCommand,
     cmd="remove-section",
-    help=_("Remove a section from the Ruyi config"),
+    help="Remove a section from the Ruyi config",
 ):
     @classmethod
     def configure_args(
@@ -156,7 +153,7 @@ class ConfigRemoveSectionCommand(
         p.add_argument(
             "section",
             type=str,
-            help=_("The section to remove"),
+            help="The section to remove",
         )
 
     @classmethod

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/cli/main.py

@@ -4,7 +4,6 @@ import sys
 from typing import Final, TYPE_CHECKING
 
 from ..config import GlobalConfig
-from ..i18n import _
 from ..telemetry.scope import TelemetryScope
 from ..utils.global_mode import GlobalModeProvider
 from ..version import RUYI_SEMVER
@@ -51,19 +50,10 @@ def main(gm: GlobalModeProvider, gc: GlobalConfig, argv: list[str]) -> int:
     if not is_called_as_ruyi(gm.argv0):
         if should_prompt_for_renaming(gm.argv0):
             logger.F(
-                _(
-                    "the {ruyi_exe} executable must be named [green]'{expected_name}'[/] to work"
-                ).format(
-                    ruyi_exe=RUYI_ENTRYPOINT_NAME,
-                    expected_name=RUYI_ENTRYPOINT_NAME,
-                )
+                f"the {RUYI_ENTRYPOINT_NAME} executable must be named [green]'{RUYI_ENTRYPOINT_NAME}'[/] to work"
             )
-            logger.I(
-                _("it is now [yellow]'{current_name}'[/]").format(
-                    current_name=gm.argv0,
-                )
-            )
-            logger.I(_("please rename the command file and retry"))
+            logger.I(f"it is now [yellow]'{gm.argv0}'[/]")
+            logger.I("please rename the command file and retry")
             return 1
 
         from ..mux.runtime import mux_main
@@ -125,7 +115,7 @@ def main(gm: GlobalModeProvider, gc: GlobalConfig, argv: list[str]) -> int:
     try:
         telemetry_key: str = args.tele_key
     except AttributeError:
-        logger.F(_("internal error: CLI entrypoint was added without a telemetry key"))
+        logger.F("internal error: CLI entrypoint was added without a telemetry key")
         return 1
 
     # Special-case the `--output-completion-script` argument; treat it as if

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/cli/oobe.py

@@ -2,16 +2,13 @@
 
 import os
 import sys
-from typing import Callable, Final, TYPE_CHECKING
-
-from ..i18n import _, d_
+from typing import Callable, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from ..config import GlobalConfig
 
 
-SHELL_AUTO_COMPLETION_TIP: Final = d_(
-    """
+SHELL_AUTO_COMPLETION_TIP = """
 [bold green]tip[/]: you can enable shell auto-completion for [yellow]ruyi[/] by adding the
 following line to your [green]{shrc}[/], if you have not done so already:
 
@@ -21,7 +18,6 @@ You can do so by running the following command later:
 
     [green]echo 'eval "$(ruyi --output-completion-script={shell})"' >> {shrc}[/]
 """
-)
 
 
 class OOBE:
@@ -78,7 +74,7 @@ class OOBE:
             return
 
         self._gc.logger.stdout(
-            _(SHELL_AUTO_COMPLETION_TIP).format(
+            SHELL_AUTO_COMPLETION_TIP.format(
                 shell=shell,
                 shrc=f"~/.{shell}rc",
             )

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/cli/self_cli.py

@@ -4,16 +4,13 @@ import pathlib
 import shutil
 from typing import Final, TYPE_CHECKING
 
-from ..i18n import _, d_
 from .cmd import RootCommand
 
 if TYPE_CHECKING:
     from .completion import ArgumentParser
     from .. import config
 
-
-UNINSTALL_NOTICE: Final = d_(
-    """
+UNINSTALL_NOTICE: Final = """
 [bold]Thanks for hacking with [yellow]Ruyi[/]![/]
 
 This will uninstall [yellow]Ruyi[/] from your system, and optionally remove
@@ -24,7 +21,6 @@ Note that your [yellow]Ruyi[/] virtual environments [bold]will become unusable[/
 [yellow]Ruyi[/] is uninstalled. You should take care of migrating or cleaning
 them yourselves afterwards.
 """
-)
 
 
 # Self-management commands
@@ -32,7 +28,7 @@ class SelfCommand(
     RootCommand,
     cmd="self",
     has_subcommands=True,
-    help=_("Manage this Ruyi installation"),
+    help="Manage this Ruyi installation",
 ):
     @classmethod
     def configure_args(
@@ -46,7 +42,7 @@ class SelfCommand(
 class SelfCleanCommand(
     SelfCommand,
     cmd="clean",
-    help=_("Remove various Ruyi-managed data to reclaim storage"),
+    help="Remove various Ruyi-managed data to reclaim storage",
 ):
     @classmethod
     def configure_args(
@@ -58,42 +54,42 @@ class SelfCleanCommand(
             "--quiet",
             "-q",
             action="store_true",
-            help=_("Do not print out the actions being performed"),
+            help="Do not print out the actions being performed",
         )
         p.add_argument(
             "--all",
             action="store_true",
-            help=_("Remove all covered data"),
+            help="Remove all covered data",
         )
         p.add_argument(
             "--distfiles",
             action="store_true",
-            help=_("Remove all downloaded distfiles if any"),
+            help="Remove all downloaded distfiles if any",
         )
         p.add_argument(
             "--installed-pkgs",
             action="store_true",
-            help=_("Remove all installed packages if any"),
+            help="Remove all installed packages if any",
         )
         p.add_argument(
             "--news-read-status",
             action="store_true",
-            help=_("Mark all news items as unread"),
+            help="Mark all news items as unread",
         )
         p.add_argument(
             "--progcache",
             action="store_true",
-            help=_("Clear the Ruyi program cache"),
+            help="Clear the Ruyi program cache",
         )
         p.add_argument(
             "--repo",
             action="store_true",
-            help=_("Remove the Ruyi repo if located in Ruyi-managed cache directory"),
+            help="Remove the Ruyi repo if located in Ruyi-managed cache directory",
         )
         p.add_argument(
             "--telemetry",
             action="store_true",
-            help=_("Remove all telemetry data recorded if any"),
+            help="Remove all telemetry data recorded if any",
         )
 
     @classmethod
@@ -126,11 +122,9 @@ class SelfCleanCommand(
                 telemetry,
             ]
         ):
-            logger.F(_("no data specified for cleaning"))
+            logger.F("no data specified for cleaning")
             logger.I(
-                _(
-                    "please check [yellow]ruyi self clean --help[/] for a list of cleanable data"
-                )
+                "please check [yellow]ruyi self clean --help[/] for a list of cleanable data"
             )
             return 1
 
@@ -155,7 +149,7 @@ class SelfCleanCommand(
 class SelfUninstallCommand(
     SelfCommand,
     cmd="uninstall",
-    help=_("Uninstall Ruyi"),
+    help="Uninstall Ruyi",
 ):
     @classmethod
     def configure_args(
@@ -166,15 +160,13 @@ class SelfUninstallCommand(
         p.add_argument(
             "--purge",
             action="store_true",
-            help=_("Remove all installed packages and Ruyi-managed remote repo data"),
+            help="Remove all installed packages and Ruyi-managed remote repo data",
         )
         p.add_argument(
             "-y",
             action="store_true",
             dest="consent",
-            help=_(
-                "Give consent for uninstallation on CLI; do not ask for confirmation"
-            ),
+            help="Give consent for uninstallation on CLI; do not ask for confirmation",
         )
 
     @classmethod
@@ -188,28 +180,24 @@ class SelfUninstallCommand(
 
         if cfg.is_installation_externally_managed:
             logger.F(
-                _(
-                    "this [yellow]ruyi[/] is externally managed, for example, by the system package manager, and cannot be uninstalled this way"
-                )
+                "this [yellow]ruyi[/] is externally managed, for example, by the system package manager, and cannot be uninstalled this way"
             )
-            logger.I(_("please uninstall via the external manager instead"))
+            logger.I("please uninstall via the external manager instead")
             return 1
 
         if not cfg.is_packaged:
             logger.F(
-                _(
-                    "this [yellow]ruyi[/] is not in standalone form, and cannot be uninstalled this way"
-                )
+                "this [yellow]ruyi[/] is not in standalone form, and cannot be uninstalled this way"
             )
             return 1
 
         if not consent:
-            logger.stdout(_(UNINSTALL_NOTICE))
-            if not user_input.ask_for_yesno_confirmation(logger, _("Continue?")):
-                logger.I(_("aborting uninstallation"))
+            logger.stdout(UNINSTALL_NOTICE)
+            if not user_input.ask_for_yesno_confirmation(logger, "Continue?"):
+                logger.I("aborting uninstallation")
                 return 0
         else:
-            logger.I(_("uninstallation consent given over CLI, proceeding"))
+            logger.I("uninstallation consent given over CLI, proceeding")
 
         _do_reset(
             cfg,
@@ -220,7 +208,7 @@ class SelfUninstallCommand(
             self_binary=True,
         )
 
-        logger.I(_("[yellow]ruyi[/] is uninstalled"))
+        logger.I("[yellow]ruyi[/] is uninstalled")
 
         return 0
 
@@ -247,7 +235,7 @@ def _do_reset(
         logger.I(s)
 
     if installed_pkgs:
-        status(_("removing installed packages"))
+        status("removing installed packages")
         shutil.rmtree(cfg.data_root, True)
         cfg.ruyipkg_global_state.purge_installation_info()
 
@@ -256,28 +244,28 @@ def _do_reset(
         cfg.telemetry.discard_events(True)
 
     if all_state:
-        status(_("removing state data"))
+        status("removing state data")
         shutil.rmtree(cfg.state_root, True)
     else:
         if news_read_status:
-            status(_("removing read status of news items"))
+            status("removing read status of news items")
             cfg.news_read_status.remove()
 
         if telemetry:
-            status(_("removing all telemetry data"))
+            status("removing all telemetry data")
             shutil.rmtree(cfg.telemetry_root, True)
 
     if all_cache:
-        status(_("removing cached data"))
+        status("removing cached data")
         shutil.rmtree(cfg.cache_root, True)
     else:
         if distfiles:
-            status(_("removing downloaded distfiles"))
+            status("removing downloaded distfiles")
             # TODO: deduplicate the path derivation
             shutil.rmtree(os.path.join(cfg.cache_root, "distfiles"), True)
 
         if progcache:
-            status(_("clearing the Ruyi program cache"))
+            status("clearing the Ruyi program cache")
             # TODO: deduplicate the path derivation
             shutil.rmtree(os.path.join(cfg.cache_root, "progcache"), True)
 
@@ -295,16 +283,14 @@ def _do_reset(
 
             if not repo_is_below_cache_root:
                 logger.W(
-                    _(
-                        "not removing the Ruyi repo: it is outside of the Ruyi cache directory"
-                    )
+                    "not removing the Ruyi repo: it is outside of the Ruyi cache directory"
                 )
             else:
-                status(_("removing the Ruyi repo"))
+                status("removing the Ruyi repo")
                 shutil.rmtree(repo_dir, True)
 
     if self_binary:
-        status(_("removing the ruyi binary"))
+        status("removing the ruyi binary")
         try:
             os.unlink(cfg.self_exe)
         except FileNotFoundError:

{ruyi-0.45.0 → ruyi-0.45.0a20251230}/ruyi/cli/user_input.py

@@ -1,6 +1,5 @@
 import os.path
 
-from ..i18n import _
 from ..log import RuyiLogger
 
 
@@ -11,7 +10,7 @@ def pause_before_continuing(
 
     EOFError should be handled by the caller."""
 
-    logger.stdout(_("Press [green]<ENTER>[/] to continue: "), end="")
+    logger.stdout("Press [green]<ENTER>[/] to continue: ", end="")
     input()
 
 
@@ -27,11 +26,9 @@ def ask_for_yesno_confirmation(
             logger.stdout(f"{prompt} {choices_help} ", end="")
             user_input = input()
         except EOFError:
-            yesno = _("YES") if default else _("NO")
+            yesno = "YES" if default else "NO"
             logger.W(
-                _(
-                    "EOF while reading user input, assuming the default choice {yesno}"
-                ).format(yesno=yesno)
+                f"EOF while reading user input, assuming the default choice {yesno}"
             )
             return default
 
@@ -42,12 +39,8 @@ def ask_for_yesno_confirmation(
         if user_input in {"N", "n", "no"}:
             return False
         else:
-            logger.stdout(
-                _("Unrecognized input [yellow]'{user_input}'[/].").format(
-                    user_input=user_input
-                )
-            )
-            logger.stdout(_("Accepted choices: Y/y/yes for YES, N/n/no for NO."))
+            logger.stdout(f"Unrecognized input [yellow]'{user_input}'[/].")
+            logger.stdout("Accepted choices: Y/y/yes for YES, N/n/no for NO.")
 
 
 def ask_for_kv_choice(
@@ -88,19 +81,12 @@ def ask_for_choice(
     if default_idx is not None:
         if not (0 <= default_idx < nr_choices):
             raise ValueError(f"Default choice index {default_idx} out of range")
-        choices_help = _("(1-{nr_choices}, default {default})").format(
-            nr_choices=nr_choices,
-            default=default_idx + 1,
-        )
+        choices_help = f"(1-{nr_choices}, default {default_idx + 1})"
     else:
-        choices_help = _("(1-{nr_choices})").format(nr_choices=nr_choices)
+        choices_help = f"(1-{nr_choices})"
     while True:
         try:
-            user_input = input(
-                _("Choice? {choices_help} ").format(
-                    choices_help=choices_help,
-                )
-            )
+            user_input = input(f"Choice? {choices_help} ")
         except EOFError:
             raise ValueError("EOF while reading user choice")
 
@@ -110,34 +96,18 @@ def ask_for_choice(
         try:
             choice_int = int(user_input)
         except ValueError:
+            logger.stdout(f"Unrecognized input [yellow]'{user_input}'[/].")
             logger.stdout(
-                _("Unrecognized input [yellow]'{user_input}'[/].").format(
-                    user_input=user_input,
-                )
-            )
-            logger.stdout(
-                _(
-                    "Accepted choices: an integer number from 1 to {nr_choices} inclusive."
-                ).format(
-                    nr_choices=nr_choices,
-                )
+                f"Accepted choices: an integer number from 1 to {nr_choices} inclusive."
             )
             continue
 
         if 1 <= choice_int <= nr_choices:
             return choice_int - 1
 
+        logger.stdout(f"Out-of-range input [yellow]'{user_input}'[/].")
         logger.stdout(
-            _("Out-of-range input [yellow]'{user_input}'[/].").format(
-                user_input=user_input,
-            )
-        )
-        logger.stdout(
-            _(
-                "Accepted choices: an integer number from 1 to {nr_choices} inclusive."
-            ).format(
-                nr_choices=nr_choices,
-            )
+            f"Accepted choices: an integer number from 1 to {nr_choices} inclusive."
         )