ruyi 0.45.0__py3-none-any.whl → 0.45.0a20251230__py3-none-any.whl

ruyi/ruyipkg/list.py

@@ -1,7 +1,6 @@
 from itertools import chain
 
 from ..config import GlobalConfig
-from ..i18n import _
 from ..log import RuyiLogger
 from ..utils.porcelain import PorcelainOutput
 from .augmented_pkg import AugmentedPkg
@@ -23,11 +22,9 @@ def do_list(
             # all packages either
             return 1
 
-        logger.F(_("no filter specified for list operation"))
+        logger.F("no filter specified for list operation")
         logger.I(
-            _(
-                "for the old behavior of listing all packages, try [yellow]ruyi list --name-contains ''[/]"
-            )
+            "for the old behavior of listing all packages, try [yellow]ruyi list --name-contains ''[/]"
         )
         return 1
 
@@ -52,7 +49,7 @@ def _do_list_non_verbose(
     logger: RuyiLogger,
     augmented_pkgs: list[AugmentedPkg],
 ) -> int:
-    logger.stdout(_("List of available packages:\n"))
+    logger.stdout("List of available packages:\n")
 
     for ap in augmented_pkgs:
         logger.stdout(f"* [bold green]{ap.category}/{ap.name}[/]")
@@ -85,49 +82,45 @@ def _print_pkg_detail(
     logger.stdout(f"[bold]## [green]{pm.category}/{pm.name}[/] [blue]{pm.ver}[/][/]\n")
 
     if pm.slug is not None:
-        logger.stdout(_("* Slug: [yellow]{slug}[/]").format(slug=pm.slug))
+        logger.stdout(f"* Slug: [yellow]{pm.slug}[/]")
     else:
-        logger.stdout(_("* Slug: (none)"))
-    logger.stdout(_("* Package kind: {kind}").format(kind=sorted(pm.kind)))
-    logger.stdout(_("* Vendor: {vendor}").format(vendor=pm.vendor_name))
+        logger.stdout("* Slug: (none)")
+    logger.stdout(f"* Package kind: {sorted(pm.kind)}")
+    logger.stdout(f"* Vendor: {pm.vendor_name}")
     if upstream_ver := pm.upstream_version:
-        logger.stdout(
-            _("* Upstream version number: {version}").format(version=upstream_ver)
-        )
+        logger.stdout(f"* Upstream version number: {upstream_ver}")
     else:
-        logger.stdout(_("* Upstream version number: (undeclared)"))
+        logger.stdout("* Upstream version number: (undeclared)")
     logger.stdout("")
 
     sv = pm.service_level
     if sv.has_known_issues:
-        logger.stdout(_("\nPackage has known issue(s):\n"))
+        logger.stdout("\nPackage has known issue(s):\n")
         for x in sv.render_known_issues(pm.repo.messages, lang_code):
             logger.stdout(x, end="\n\n")
 
     df = pm.distfiles
-    logger.stdout(_("Package declares {count} distfile(s):\n").format(count=len(df)))
+    logger.stdout(f"Package declares {len(df)} distfile(s):\n")
     for dd in df.values():
         logger.stdout(f"* [green]{dd.name}[/]")
-        logger.stdout(_("    - Size: [yellow]{size}[/] bytes").format(size=dd.size))
+        logger.stdout(f"    - Size: [yellow]{dd.size}[/] bytes")
         for kind, csum in dd.checksums.items():
             logger.stdout(f"    - {kind.upper()}: [yellow]{csum}[/]")
 
     if bm := pm.binary_metadata:
-        logger.stdout(_("\n### Binary artifacts\n"))
+        logger.stdout("\n### Binary artifacts\n")
         for host, data in bm.data.items():
-            logger.stdout(_("* Host [green]{host}[/]:").format(host=host))
-            logger.stdout(
-                _("    - Distfiles: {distfiles}").format(distfiles=data["distfiles"])
-            )
+            logger.stdout(f"* Host [green]{host}[/]:")
+            logger.stdout(f"    - Distfiles: {data['distfiles']}")
             if cmds := data.get("commands"):
-                logger.stdout(_("    - Available command(s):"))
+                logger.stdout("    - Available command(s):")
                 for k in sorted(cmds.keys()):
                     logger.stdout(f"        - [green]{k}[/]")
 
     if tm := pm.toolchain_metadata:
-        logger.stdout(_("\n### Toolchain metadata\n"))
-        logger.stdout(_("* Target: [bold green]{target}[/]").format(target=tm.target))
-        logger.stdout(_("* Quirks: {quirks}").format(quirks=tm.quirks))
-        logger.stdout(_("* Components:"))
+        logger.stdout("\n### Toolchain metadata\n")
+        logger.stdout(f"* Target: [bold green]{tm.target}[/]")
+        logger.stdout(f"* Quirks: {tm.quirks}")
+        logger.stdout("* Components:")
         for tc in tm.components:
             logger.stdout(f'    - {tc["name"]} [bold green]{tc["version"]}[/]')

ruyi/ruyipkg/list_cli.py

@@ -2,7 +2,6 @@ import argparse
 from typing import TYPE_CHECKING
 
 from ..cli.cmd import RootCommand
-from ..i18n import _
 from .list_filter import ListFilter, ListFilterAction
 
 if TYPE_CHECKING:
@@ -16,7 +15,7 @@ class ListCommand(
     has_subcommands=True,
     is_subcommand_required=False,
     has_main=True,
-    help=_("List available packages in configured repository"),
+    help="List available packages in configured repository",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:
@@ -24,7 +23,7 @@ class ListCommand(
             "--verbose",
             "-v",
             action="store_true",
-            help=_("Also show details for every package"),
+            help="Also show details for every package",
         )
 
         # filter expressions
@@ -33,32 +32,28 @@ class ListCommand(
             action=ListFilterAction,
             nargs=1,
             dest="filters",
-            help=_(
-                "Match packages that are installed (y/true/1) or not installed (n/false/0)"
-            ),
+            help="Match packages that are installed (y/true/1) or not installed (n/false/0)",
         )
         p.add_argument(
             "--category-contains",
             action=ListFilterAction,
             nargs=1,
             dest="filters",
-            help=_(
-                "Match packages from categories whose names contain the given string"
-            ),
+            help="Match packages from categories whose names contain the given string",
         )
         p.add_argument(
             "--category-is",
             action=ListFilterAction,
             nargs=1,
             dest="filters",
-            help=_("Match packages from the given category"),
+            help="Match packages from the given category",
         )
         p.add_argument(
             "--name-contains",
             action=ListFilterAction,
             nargs=1,
             dest="filters",
-            help=_("Match packages whose names contain the given string"),
+            help="Match packages whose names contain the given string",
         )
 
         if gc.is_experimental:
@@ -67,7 +62,7 @@ class ListCommand(
                 action=ListFilterAction,
                 nargs=1,
                 dest="filters",
-                help=_("Match packages related to the given entity"),
+                help="Match packages related to the given entity",
             )
 
     @classmethod

ruyi/ruyipkg/news.py

@@ -2,7 +2,6 @@ from rich import box
 from rich.table import Table
 
 from ..config import GlobalConfig
-from ..i18n import _
 from ..log import RuyiLogger
 from ..utils.markdown import RuyiStyledMarkdown
 from ..utils.porcelain import PorcelainOutput
@@ -15,12 +14,9 @@ def print_news_item_titles(
     lang: str,
 ) -> None:
     tbl = Table(box=box.SIMPLE, show_edge=False)
-    # i18n NOTE: used as news item table title
-    tbl.add_column(_("No."))
-    # i18n NOTE: used as news item table title
-    tbl.add_column(_("ID"))
-    # i18n NOTE: used as news item table title
-    tbl.add_column(_("Title"))
+    tbl.add_column("No.")
+    tbl.add_column("ID")
+    tbl.add_column("Title")
 
     for ni in newsitems:
         unread = not ni.is_read
@@ -44,20 +40,14 @@ def maybe_notify_unread_news(
 
     unread_newsitems = gc.repo.news_store().list(True)
     if unread_newsitems:
-        gc.logger.stdout(
-            _("\nThere are {count} new news item(s):\n").format(
-                count=len(unread_newsitems),
-            )
-        )
+        gc.logger.stdout(f"\nThere are {len(unread_newsitems)} new news item(s):\n")
         print_news_item_titles(gc.logger, unread_newsitems, gc.lang_code)
-        gc.logger.stdout(_("\nYou can read them with [yellow]ruyi news read[/]."))
+        gc.logger.stdout("\nYou can read them with [yellow]ruyi news read[/].")
         return
 
     if prompt_no_unread:
         gc.logger.stdout(
-            _(
-                "\nAll news items have been read. To see a list of them, run [yellow]ruyi news list[/].\n"
-            )
+            "\nAll news items have been read. To see a list of them, run [yellow]ruyi news list[/].\n"
         )
 
 
@@ -75,9 +65,9 @@ def do_news_list(
                 po.emit(ni.to_porcelain())
         return 0
 
-    logger.stdout(_("[bold green]News items:[/]\n"))
+    logger.stdout("[bold green]News items:[/]\n")
     if not newsitems:
-        logger.stdout(_("  (no unread item)") if only_unread else _("  (no item)"))
+        logger.stdout("  (no unread item)" if only_unread else "  (no item)")
         return 0
 
     print_news_item_titles(logger, newsitems, cfg.lang_code)
@@ -108,7 +98,7 @@ def do_news_read(
             for ni in items:
                 print_news(logger, ni.get_content_for_lang(cfg.lang_code))
         else:
-            logger.stdout(_("No news to display."))
+            logger.stdout("No news to display.")
 
     # record read statuses
     store.mark_as_read(*(ni.id for ni in items))
@@ -133,15 +123,13 @@ def filter_news_items_by_specs(
         try:
             ni_ord = int(i)
             if ni_ord not in ni_by_ord:
-                logger.F(
-                    _("there is no news item with ordinal {ord}").format(ord=ni_ord)
-                )
+                logger.F(f"there is no news item with ordinal {ni_ord}")
                 return None
             items.append(ni_by_ord[ni_ord])
         except ValueError:
             # treat i as id
             if i not in ni_by_id:
-                logger.F(_("there is no news item with ID '{id}'").format(id=i))
+                logger.F(f"there is no news item with ID '{i}'")
                 return None
             items.append(ni_by_id[i])
 

ruyi/ruyipkg/news_cli.py

@@ -2,7 +2,6 @@ import argparse
 from typing import TYPE_CHECKING
 
 from ..cli.cmd import RootCommand
-from ..i18n import _
 
 if TYPE_CHECKING:
     from ..cli.completion import ArgumentParser
@@ -15,7 +14,7 @@ class NewsCommand(
     has_subcommands=True,
     is_subcommand_required=False,
     has_main=True,
-    help=_("List and read news items from configured repository"),
+    help="List and read news items from configured repository",
 ):
     _my_parser: "ArgumentParser | None" = None
 
@@ -37,14 +36,14 @@ class NewsCommand(
 class NewsListCommand(
     NewsCommand,
     cmd="list",
-    help=_("List news items"),
+    help="List news items",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:
         p.add_argument(
             "--new",
             action="store_true",
-            help=_("List unread news items only"),
+            help="List unread news items only",
         )
 
     @classmethod
@@ -61,10 +60,8 @@ class NewsListCommand(
 class NewsReadCommand(
     NewsCommand,
     cmd="read",
-    help=_("Read news items"),
-    description=_(
-        "Outputs news item(s) to the console and mark as already read. Defaults to reading all unread items if no item is specified."
-    ),
+    help="Read news items",
+    description="Outputs news item(s) to the console and mark as already read. Defaults to reading all unread items if no item is specified.",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:
@@ -72,13 +69,13 @@ class NewsReadCommand(
             "--quiet",
             "-q",
             action="store_true",
-            help=_("Do not output anything and only mark as read"),
+            help="Do not output anything and only mark as read",
         )
         p.add_argument(
             "item",
             type=str,
             nargs="*",
-            help=_("Ordinal or ID of the news item(s) to read"),
+            help="Ordinal or ID of the news item(s) to read",
         )
 
     @classmethod

ruyi/ruyipkg/profile_cli.py

@@ -1,7 +1,6 @@
 import argparse
 from typing import TYPE_CHECKING
 
-from ..i18n import _
 from .list_cli import ListCommand
 
 if TYPE_CHECKING:
@@ -12,7 +11,7 @@ if TYPE_CHECKING:
 class ListProfilesCommand(
     ListCommand,
     cmd="profiles",
-    help=_("List all available profiles"),
+    help="List all available profiles",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:
@@ -29,11 +28,6 @@ class ListProfilesCommand(
                     logger.stdout(p.id)
                     continue
 
-                logger.stdout(
-                    _("{profile_id} (needs quirks: {need_quirks})").format(
-                        profile_id=p.id,
-                        need_quirks=p.need_quirks,
-                    )
-                )
+                logger.stdout(f"{p.id} (needs quirks: {p.need_quirks})")
 
         return 0

ruyi/ruyipkg/repo.py

@@ -19,7 +19,6 @@ from urllib import parse
 from pygit2 import clone_repository
 from pygit2.repository import Repository
 
-from ..i18n import _
 from ..log import RuyiLogger
 from ..pluginhost.ctx import PluginHostContext
 from ..telemetry.scope import TelemetryScopeConfig
@@ -168,9 +167,7 @@ class RepoConfig:
                 return [url]
             case _:
                 # deny others
-                logger.W(
-                    _("unrecognized dist URL scheme: {scheme}").format(scheme=u.scheme)
-                )
+                logger.W(f"unrecognized dist URL scheme: {u.scheme}")
                 return []
 
     def get_mirror_urls_for_file(self, mirror_id: str, path: str) -> list[str]:
@@ -289,13 +286,9 @@ class MetadataRepo(ProvidesPackageManifests):
             return self.repo
 
         self.logger.I(
-            _("the package repository does not exist at [yellow]{root}[/]").format(
-                root=self.root
-            )
-        )
-        self.logger.I(
-            _("cloning from [cyan link={remote}]{remote}[/]").format(remote=self.remote)
+            f"the package repository does not exist at [yellow]{self.root}[/]"
         )
+        self.logger.I(f"cloning from [cyan link={self.remote}]{self.remote}[/]")
 
         with RemoteGitProgressIndicator() as pr:
             repo = clone_repository(
@@ -317,7 +310,7 @@ class MetadataRepo(ProvidesPackageManifests):
         return self.repo
 
     def sync(self) -> None:
-        self._gc.logger.I(_("updating the package repository"))
+        self._gc.logger.I("updating the package repository")
 
         repo = self.ensure_git_repo()
 
@@ -334,7 +327,7 @@ class MetadataRepo(ProvidesPackageManifests):
             allow_auto_management=allow_auto_management,
         )
 
-        self._gc.logger.I(_("package repository is updated"))
+        self._gc.logger.I("package repository is updated")
 
     @property
     def global_config(self) -> "GlobalConfig":
@@ -612,9 +605,7 @@ class MetadataRepo(ProvidesPackageManifests):
                         contents = fp.read()
                     except UnicodeDecodeError:
                         self.logger.W(
-                            _("UnicodeDecodeError: {path}").format(
-                                path=os.path.join(news_dir, f)
-                            )
+                            f"UnicodeDecodeError: {os.path.join(news_dir, f)}"
                         )
                         continue
                     cache.add(f, contents)  # may fail but failures are harmless
@@ -647,14 +638,9 @@ class MetadataRepo(ProvidesPackageManifests):
         ret = self.eval_plugin_fn(plugin_entrypoint, args)
         if not isinstance(ret, int):
             self.logger.W(
-                _(
-                    "unexpected return type of cmd plugin '{plugin_id}': {type} is not int."
-                ).format(
-                    plugin_id=plugin_id,
-                    type=type(ret),
-                )
+                f"unexpected return type of cmd plugin '{plugin_id}': {type(ret)} is not int."
             )
-            self.logger.I(_("forcing return code to 1; the plugin should be fixed"))
+            self.logger.I("forcing return code to 1; the plugin should be fixed")
             ret = 1
         return ret
 

ruyi/ruyipkg/unpack.py

@@ -4,7 +4,6 @@ import shutil
 import subprocess
 from typing import Any, BinaryIO, NoReturn, Protocol
 
-from ..i18n import _
 from ..log import RuyiLogger
 from ..utils import ar, prereqs
 from .unpack_method import (
@@ -193,12 +192,7 @@ def _do_unpack_tar(
         retcode = p.wait()
 
     if retcode != 0:
-        raise RuntimeError(
-            _("untar failed: command {cmd} returned {retcode}").format(
-                cmd=" ".join(argv),
-                retcode=retcode,
-            )
-        )
+        raise RuntimeError(f"untar failed: command {' '.join(argv)} returned {retcode}")
 
 
 def _do_unpack_zip(
@@ -212,12 +206,7 @@ def _do_unpack_zip(
     logger.D(f"about to call unzip: argv={argv}")
     retcode = subprocess.call(argv, cwd=dest)
     if retcode != 0:
-        raise RuntimeError(
-            _("unzip failed: command {cmd} returned {retcode}").format(
-                cmd=" ".join(argv),
-                retcode=retcode,
-            )
-        )
+        raise RuntimeError(f"unzip failed: command {' '.join(argv)} returned {retcode}")
 
 
 def _do_unpack_bare_gz(
@@ -237,10 +226,7 @@ def _do_unpack_bare_gz(
         retcode = subprocess.call(argv, stdout=out)
         if retcode != 0:
             raise RuntimeError(
-                _("gunzip failed: command {cmd} returned {retcode}").format(
-                    cmd=" ".join(argv),
-                    retcode=retcode,
-                )
+                f"gunzip failed: command {' '.join(argv)} returned {retcode}"
             )
 
 
@@ -261,10 +247,7 @@ def _do_unpack_bare_bzip2(
         retcode = subprocess.call(argv, stdout=out)
         if retcode != 0:
             raise RuntimeError(
-                _("bzip2 failed: command {cmd} returned {retcode}").format(
-                    cmd=" ".join(argv),
-                    retcode=retcode,
-                )
+                f"bzip2 failed: command {' '.join(argv)} returned {retcode}"
             )
 
 
@@ -280,12 +263,7 @@ def _do_unpack_bare_lz4(
     logger.D(f"about to call lz4: argv={argv}")
     retcode = subprocess.call(argv, cwd=destdir)
     if retcode != 0:
-        raise RuntimeError(
-            _("lz4 failed: command {cmd} returned {retcode}").format(
-                cmd=" ".join(argv),
-                retcode=retcode,
-            )
-        )
+        raise RuntimeError(f"lz4 failed: command {' '.join(argv)} returned {retcode}")
 
 
 def _do_unpack_bare_xz(
@@ -305,10 +283,7 @@ def _do_unpack_bare_xz(
         retcode = subprocess.call(argv, stdout=out)
         if retcode != 0:
             raise RuntimeError(
-                _("xz failed: command {cmd} returned {retcode}").format(
-                    cmd=" ".join(argv),
-                    retcode=retcode,
-                )
+                f"xz failed: command {' '.join(argv)} returned {retcode}"
             )
 
 
@@ -324,12 +299,7 @@ def _do_unpack_bare_zstd(
     logger.D(f"about to call zstd: argv={argv}")
     retcode = subprocess.call(argv, cwd=destdir)
     if retcode != 0:
-        raise RuntimeError(
-            _("zstd failed: command {cmd} returned {retcode}").format(
-                cmd=" ".join(argv),
-                retcode=retcode,
-            )
-        )
+        raise RuntimeError(f"zstd failed: command {' '.join(argv)} returned {retcode}")
 
 
 def _do_unpack_deb(
@@ -351,11 +321,7 @@ def _do_unpack_deb(
                     a.open(f),
                 )
 
-    raise RuntimeError(
-        _("file '{filename}' does not appear to be a deb").format(
-            filename=filename,
-        )
-    )
+    raise RuntimeError(f"file '{filename}' does not appear to be a deb")
 
 
 def _get_unpack_cmds_for_method(m: UnpackMethod) -> list[str]:

ruyi/ruyipkg/unpack_method.py

@@ -3,8 +3,6 @@ import re
 import sys
 from typing import Final
 
-from ..i18n import _
-
 RE_TARBALL: Final = re.compile(r"\.tar(?:\.gz|\.bz2|\.lz4|\.xz|\.zst)?$")
 
 
@@ -62,9 +60,7 @@ class UnrecognizedPackFormatError(Exception):
         self.filename = filename
 
     def __str__(self) -> str:
-        return _("don't know how to unpack file {filename}").format(
-            filename=self.filename,
-        )
+        return f"don't know how to unpack file {self.filename}"
 
 
 def determine_unpack_method(

ruyi/ruyipkg/update_cli.py

@@ -2,7 +2,6 @@ import argparse
 from typing import TYPE_CHECKING
 
 from ..cli.cmd import RootCommand
-from ..i18n import _
 
 if TYPE_CHECKING:
     from ..cli.completion import ArgumentParser
@@ -12,7 +11,7 @@ if TYPE_CHECKING:
 class UpdateCommand(
     RootCommand,
     cmd="update",
-    help=_("Update RuyiSDK repo and packages"),
+    help="Update RuyiSDK repo and packages",
 ):
     @classmethod
     def configure_args(cls, gc: "GlobalConfig", p: "ArgumentParser") -> None:
@@ -33,20 +32,16 @@ class UpdateCommand(
 
         if upgradable:
             logger.stdout(
-                _(
-                    "\nNewer versions are available for some of your installed packages:\n"
-                )
+                "\nNewer versions are available for some of your installed packages:\n"
             )
             for pm, new_ver in upgradable:
                 logger.stdout(
                     f"  - [bold]{pm.category}/{pm.name}[/]: [yellow]{pm.ver}[/] -> [green]{new_ver}[/]"
                 )
             logger.stdout(
-                _(
-                    """
+                """
 Re-run [yellow]ruyi install[/] to upgrade, and don't forget to re-create any affected
 virtual environments."""
-                )
             )
 
         news.maybe_notify_unread_news(cfg, False)