bitool 0.1.2__tar.gz → 0.1.3__tar.gz

{bitool-0.1.2 → bitool-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitool
-Version: 0.1.2
+Version: 0.1.3
 Summary: Bitool - Rust + Python 混合架构工具集
 Project-URL: Homepage, https://gitee.com/gooker_young/bitool
 Project-URL: Issues, https://gitee.com/gooker_young/bitool/issues

{bitool-0.1.2 → bitool-0.1.3}/bitool-core/Cargo.toml

@@ -4,7 +4,7 @@ description = "Bitool Maturin - Rust + Python 混合架构工具集"
 edition     = "2021"
 license     = "MIT"
 name        = "bitool_core"
-version     = "0.1.2"
+version     = "0.1.3"
 
 [lib]
 crate-type = ["cdylib"]

{bitool-0.1.2 → bitool-0.1.3}/bitool-core/pyproject.toml

@@ -20,4 +20,4 @@ license = { text = "MIT" }
 name = "bitool_core"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.1.2"
+version = "0.1.3"

{bitool-0.1.2 → bitool-0.1.3}/pyproject.toml

@@ -27,7 +27,7 @@ license = { text = "MIT" }
 name = "bitool"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.1.2"
+version = "0.1.3"
 
 [project.urls]
 Homepage = "https://gitee.com/gooker_young/bitool"

{bitool-0.1.2 → bitool-0.1.3}/src/bitool/__init__.py

@@ -1,6 +1,6 @@
 """Bitool Maturin - Rust + Python 混合架构工具集."""
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 __author__ = "gooker_young"
 
 

bitool-0.1.3/src/bitool/scripts/envpy.py

@@ -0,0 +1,174 @@
+"""Python环境配置工具模块。
+
+用于设置pip镜像源, 支持清华和阿里云等国内镜像源。
+"""
+
+from __future__ import annotations
+
+import argparse
+from pathlib import Path
+
+from bitool.cmd import CommandScheduler, SetEnvCommand, WriteFileCommand
+from bitool.consts import Constants
+from bitool.core import ConfigMixin
+
+
+class EnvPyConfig(ConfigMixin):
+    """Python环境配置类。"""
+
+    # pip 镜像源配置
+    PIP_DEFAULT_INDEX_URL: str = "https://pypi.org/simple"
+    PIP_INDEX_URLS: dict[str, str] = {  # noqa: RUF012
+        "tsinghua": "https://pypi.tuna.tsinghua.edu.cn/simple",
+        "aliyun": "https://mirrors.aliyun.com/pypi/simple/",
+    }
+    PIP_TRUSTED_HOSTS: dict[str, str] = {  # noqa: RUF012
+        "tsinghua": "pypi.tuna.tsinghua.edu.cn",
+        "aliyun": "mirrors.aliyun.com",
+    }
+
+    # UV相关配置
+    UV_INDEX_URL: str = "https://mirrors.aliyun.com/pypi/simple/"
+    UV_DEFAULT_INDEX: str = "https://mirrors.aliyun.com/pypi/simple/"
+    UV_HTTP_TIMEOUT: int = 600
+    UV_LINK_MODE: str = "copy"
+
+    # Conda相关配置
+    CONDA_DEFAULT_MIRROR = "tsinghua"
+    _CONDA_MIRROR_URLS: dict[str, list[str]] = {  # noqa: RUF012
+        "tsinghua": [
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/r/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/msys2/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/pro/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/bioconda/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/menpo/",
+            "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/pytorch/",
+        ],
+        "ustc": [
+            "https://mirrors.ustc.edu.cn/anaconda/pkgs/main/",
+            "https://mirrors.ustc.edu.cn/anaconda/pkgs/free/",
+            "https://mirrors.ustc.edu.cn/anaconda/pkgs/r/",
+            "https://mirrors.ustc.edu.cn/anaconda/pkgs/msys2/",
+            "https://mirrors.ustc.edu.cn/anaconda/pkgs/pro/",
+            "https://mirrors.ustc.edu.cn/anaconda/pkgs/dev/",
+            "https://mirrors.ustc.edu.cn/anaconda/cloud/conda-forge/",
+            "https://mirrors.ustc.edu.cn/anaconda/cloud/bioconda/",
+            "https://mirrors.ustc.edu.cn/anaconda/cloud/menpo/",
+            "https://mirrors.ustc.edu.cn/anaconda/cloud/pytorch/",
+        ],
+        "bsfu": [
+            "https://mirrors.bsfu.edu.cn/anaconda/pkgs/main/",
+            "https://mirrors.bsfu.edu.cn/anaconda/pkgs/free/",
+            "https://mirrors.bsfu.edu.cn/anaconda/pkgs/r/",
+            "https://mirrors.bsfu.edu.cn/anaconda/pkgs/msys2/",
+            "https://mirrors.bsfu.edu.cn/anaconda/pkgs/pro/",
+            "https://mirrors.bsfu.edu.cn/anaconda/pkgs/dev/",
+            "https://mirrors.bsfu.edu.cn/anaconda/cloud/conda-forge/",
+            "https://mirrors.bsfu.edu.cn/anaconda/cloud/bioconda/",
+            "https://mirrors.bsfu.edu.cn/anaconda/cloud/menpo/",
+            "https://mirrors.bsfu.edu.cn/anaconda/cloud/pytorch/",
+        ],
+        "aliyun": [
+            "https://mirrors.aliyun.com/anaconda/pkgs/main/",
+            "https://mirrors.aliyun.com/anaconda/pkgs/free/",
+            "https://mirrors.aliyun.com/anaconda/pkgs/r/",
+            "https://mirrors.aliyun.com/anaconda/pkgs/msys2/",
+            "https://mirrors.aliyun.com/anaconda/pkgs/pro/",
+            "https://mirrors.aliyun.com/anaconda/pkgs/dev/",
+            "https://mirrors.aliyun.com/anaconda/cloud/conda-forge/",
+            "https://mirrors.aliyun.com/anaconda/cloud/bioconda/",
+            "https://mirrors.aliyun.com/anaconda/cloud/menpo/",
+            "https://mirrors.aliyun.com/anaconda/cloud/pytorch/",
+        ],
+    }
+
+
+conf = EnvPyConfig()
+
+
+def create_scheduler(
+    mirror: str = "tsinghua", token: str | None = None
+) -> CommandScheduler:
+    """创建设置pip镜像源的命令调度器。
+
+    Args:
+        mirror: 镜像源名称, 默认为"tsinghua"。
+
+    Returns:
+        命令调度器实例。
+    """
+    return CommandScheduler(
+        commands=[
+            SetEnvCommand(
+                envs=[
+                    (
+                        "PIP_INDEX_URL",
+                        conf.PIP_INDEX_URLS.get(mirror, conf.PIP_DEFAULT_INDEX_URL),
+                    ),
+                    ("UV_INDEX_URL", conf.UV_INDEX_URL),
+                    ("UV_DEFAULT_INDEX", conf.UV_DEFAULT_INDEX),
+                    ("UV_HTTP_TIMEOUT", str(conf.UV_HTTP_TIMEOUT)),
+                    ("UV_LINK_MODE", conf.UV_LINK_MODE),
+                ]
+            ),
+            WriteFileCommand(
+                filepath=Path.home() / ".pip" / "pip.conf"
+                if Constants.IS_UNIX
+                else Path.home() / "pip" / "pip.ini",
+                content=f"[global]\nindex-url = {conf.PIP_INDEX_URLS.get(mirror, conf.PIP_DEFAULT_INDEX_URL)}\
+                    \n[install]\ntrusted-host = {conf.PIP_TRUSTED_HOSTS.get(mirror, '')}",
+            ),
+            WriteFileCommand(
+                filepath=Path.home() / ".condarc",
+                content="show_channel_urls: true\nchannels:\n"
+                + "\n".join(
+                    f"  - {url}"
+                    for url in conf._CONDA_MIRROR_URLS.get(
+                        mirror, conf._CONDA_MIRROR_URLS["tsinghua"]
+                    )
+                )
+                + "\n  - defaults",
+            ),
+            WriteFileCommand(
+                filepath=Path.home() / ".pypirc",
+                content=f"""[pypi]
+repository: https://upload.pypi.org/legacy/
+username: __token__
+password: {token if token else ""}
+""",
+                allow_conditions=[(lambda: bool(token), "有效的token")],
+            ),
+        ]
+    )
+
+
+def parse_args() -> argparse.Namespace:
+    """解析命令行参数。
+
+    Returns:
+        解析后的参数命名空间。
+    """
+    parser = argparse.ArgumentParser(description="设置Python包的pip镜像源")
+    parser.add_argument(
+        "mirror",
+        type=str,
+        nargs="?",
+        default="tsinghua",
+        choices=conf.PIP_INDEX_URLS.keys(),
+        help="要使用的pip镜像源",
+    )
+    parser.add_argument(
+        "--token", type=str, nargs="?", help="PyPI token for publishing"
+    )
+    return parser.parse_args()
+
+
+def main() -> None:
+    """主函数, 解析命令行参数并运行调度器。"""
+    args = parse_args()
+
+    scheduler = create_scheduler(mirror=args.mirror, token=args.token)
+    scheduler.run()

{bitool-0.1.2 → bitool-0.1.3}/src/bitool/scripts/pymake.py

@@ -53,6 +53,7 @@ conf = PyMakeConfig()
 _MATURIN_CONDITION = BuiltinConditions.HAS_APP_INSTALLED(conf.MATURIN_TOOL)
 _PYTEST_CONDITION = BuiltinConditions.HAS_APP_INSTALLED("pytest")
 _UV_CONDITION = BuiltinConditions.HAS_APP_INSTALLED(conf.BUILD_TOOL)
+_HATCH_CONDITION = BuiltinConditions.HAS_APP_INSTALLED("hatch")
 _RUFF_CONDITION = BuiltinConditions.HAS_APP_INSTALLED("ruff")
 _GIT_CONDITION = BuiltinConditions.HAS_APP_INSTALLED("git")
 
@@ -240,18 +241,22 @@ def create_scheduler_map() -> dict[str, CommandScheduler]:
         # 发布到 PyPI（先发布 Rust 核心模块，再发布 Python 主包）
         "pb": CommandScheduler(
             commands=[
-                # 发布 Rust 核心模块
+                # 发布 Rust 核心模块（在 core 目录执行）
                 RunCommand(
-                    cmd=["maturin", "publish", "-r"],
+                    name="publish-rust",
+                    cmd=["maturin", "publish"],
                     cwd=conf.CORE_DIR,
                     allow_conditions=[_MATURIN_CONDITION],
                     timeout=conf.BUILD_TIMEOUT,
                 ),
-                # 发布 Python 主包
+                # 发布 Python 主包（在项目根目录执行，依赖 Rust 发布成功）
                 RunCommand(
-                    cmd=["uv", "publish"],
-                    allow_conditions=[_UV_CONDITION],
+                    name="publish-python",
+                    cmd=["hatch", "publish"],
+                    cwd=conf.PROJECT_ROOT,
+                    allow_conditions=[_HATCH_CONDITION],
                     timeout=conf.BUILD_TIMEOUT,
+                    dependencies=["publish-rust"],
                 ),
             ]
         ),

bitool-0.1.2/src/bitool/scripts/envpy.py

@@ -1,161 +0,0 @@
-"""Python环境配置工具模块。
-
-用于设置pip镜像源, 支持清华和阿里云等国内镜像源。
-"""
-
-from __future__ import annotations
-
-import argparse
-from pathlib import Path
-
-from bitool.cmd import CommandScheduler, SetEnvCommand, WriteFileCommand
-from bitool.consts import Constants
-from bitool.core import ConfigMixin
-
-
-class EnvPyConfig(ConfigMixin):
-    """Python环境配置类。"""
-
-    # pip 镜像源配置
-    PIP_DEFAULT_INDEX_URL: str = "https://pypi.org/simple"
-    PIP_INDEX_URLS: dict[str, str] = {  # noqa: RUF012
-        "tsinghua": "https://pypi.tuna.tsinghua.edu.cn/simple",
-        "aliyun": "https://mirrors.aliyun.com/pypi/simple/",
-    }
-    PIP_TRUSTED_HOSTS: dict[str, str] = {  # noqa: RUF012
-        "tsinghua": "pypi.tuna.tsinghua.edu.cn",
-        "aliyun": "mirrors.aliyun.com",
-    }
-
-    # UV相关配置
-    UV_INDEX_URL: str = "https://mirrors.aliyun.com/pypi/simple/"
-    UV_DEFAULT_INDEX: str = "https://mirrors.aliyun.com/pypi/simple/"
-    UV_HTTP_TIMEOUT: int = 600
-    UV_LINK_MODE: str = "copy"
-
-    # Conda相关配置
-    CONDA_DEFAULT_MIRROR = "tsinghua"
-    _CONDA_MIRROR_URLS: dict[str, frozenset[str]] = {  # noqa: RUF012
-        "tsinghua": frozenset(
-            [
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/r/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/msys2/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/pro/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/bioconda/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/menpo/",
-                "https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/pytorch/",
-            ]
-        ),
-        "ustc": frozenset(
-            [
-                "https://mirrors.ustc.edu.cn/anaconda/pkgs/main/",
-                "https://mirrors.ustc.edu.cn/anaconda/pkgs/free/",
-                "https://mirrors.ustc.edu.cn/anaconda/pkgs/r/",
-                "https://mirrors.ustc.edu.cn/anaconda/pkgs/msys2/",
-                "https://mirrors.ustc.edu.cn/anaconda/pkgs/pro/",
-                "https://mirrors.ustc.edu.cn/anaconda/pkgs/dev/",
-                "https://mirrors.ustc.edu.cn/anaconda/cloud/conda-forge/",
-                "https://mirrors.ustc.edu.cn/anaconda/cloud/bioconda/",
-                "https://mirrors.ustc.edu.cn/anaconda/cloud/menpo/",
-                "https://mirrors.ustc.edu.cn/anaconda/cloud/pytorch/",
-            ]
-        ),
-        "bsfu": frozenset(
-            [
-                "https://mirrors.bsfu.edu.cn/anaconda/pkgs/main/",
-                "https://mirrors.bsfu.edu.cn/anaconda/pkgs/free/",
-                "https://mirrors.bsfu.edu.cn/anaconda/pkgs/r/",
-                "https://mirrors.bsfu.edu.cn/anaconda/pkgs/msys2/",
-                "https://mirrors.bsfu.edu.cn/anaconda/pkgs/pro/",
-                "https://mirrors.bsfu.edu.cn/anaconda/pkgs/dev/",
-                "https://mirrors.bsfu.edu.cn/anaconda/cloud/conda-forge/",
-                "https://mirrors.bsfu.edu.cn/anaconda/cloud/bioconda/",
-                "https://mirrors.bsfu.edu.cn/anaconda/cloud/menpo/",
-                "https://mirrors.bsfu.edu.cn/anaconda/cloud/pytorch/",
-            ]
-        ),
-        "aliyun": frozenset(
-            [
-                "https://mirrors.aliyun.com/anaconda/pkgs/main/",
-                "https://mirrors.aliyun.com/anaconda/pkgs/free/",
-                "https://mirrors.aliyun.com/anaconda/pkgs/r/",
-                "https://mirrors.aliyun.com/anaconda/pkgs/msys2/",
-                "https://mirrors.aliyun.com/anaconda/pkgs/pro/",
-                "https://mirrors.aliyun.com/anaconda/pkgs/dev/",
-                "https://mirrors.aliyun.com/anaconda/cloud/conda-forge/",
-                "https://mirrors.aliyun.com/anaconda/cloud/bioconda/",
-                "https://mirrors.aliyun.com/anaconda/cloud/menpo/",
-                "https://mirrors.aliyun.com/anaconda/cloud/pytorch/",
-            ]
-        ),
-    }
-
-
-conf = EnvPyConfig()
-
-
-def create_scheduler(mirror: str = "tsinghua") -> CommandScheduler:
-    """创建设置pip镜像源的命令调度器。
-
-    Args:
-        mirror: 镜像源名称, 默认为"tsinghua"。
-
-    Returns:
-        命令调度器实例。
-    """
-    return CommandScheduler(
-        commands=[
-            SetEnvCommand(
-                envs=[
-                    (
-                        "PIP_INDEX_URL",
-                        conf.PIP_INDEX_URLS.get(mirror, conf.PIP_DEFAULT_INDEX_URL),
-                    ),
-                    ("UV_INDEX_URL", conf.UV_INDEX_URL),
-                    ("UV_DEFAULT_INDEX", conf.UV_DEFAULT_INDEX),
-                    ("UV_HTTP_TIMEOUT", str(conf.UV_HTTP_TIMEOUT)),
-                    ("UV_LINK_MODE", conf.UV_LINK_MODE),
-                ]
-            ),
-            WriteFileCommand(
-                filepath=Path.home() / ".pip" / "pip.conf"
-                if Constants.IS_UNIX
-                else Path.home() / "pip" / "pip.ini",
-                content=f"[global]\nindex-url = {conf.PIP_INDEX_URLS.get(mirror, conf.PIP_DEFAULT_INDEX_URL)}\
-                    \n[install]\ntrusted-host = {conf.PIP_TRUSTED_HOSTS.get(mirror, '')}",
-            ),
-            WriteFileCommand(
-                filepath=Path.home() / ".condarc",
-                content=f"show_channel_urls: true\nchannels:\n  - {conf._CONDA_MIRROR_URLS.get(mirror, conf._CONDA_MIRROR_URLS['tsinghua'])}\n  - defaults",
-            ),
-        ]
-    )
-
-
-def parse_args() -> argparse.Namespace:
-    """解析命令行参数。
-
-    Returns:
-        解析后的参数命名空间。
-    """
-    parser = argparse.ArgumentParser(description="设置Python包的pip镜像源")
-    parser.add_argument(
-        "mirror",
-        type=str,
-        nargs="?",
-        default="tsinghua",
-        choices=conf.PIP_INDEX_URLS.keys(),
-        help="要使用的pip镜像源",
-    )
-    return parser.parse_args()
-
-
-def main() -> None:
-    """主函数, 解析命令行参数并运行调度器。"""
-    args = parse_args()
-
-    scheduler = create_scheduler(mirror=args.mirror)
-    scheduler.run()