xt-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{xt_cli-0.2.1/src/xt_cli.egg-info → xt_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xt-cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: xt sdk command line tool
 Author: xt-sdk
 License-Expression: Apache-2.0

{xt_cli-0.2.1 → xt_cli-0.2.2}/pyproject.toml

@@ -1,35 +1,32 @@
-[build-system]
-requires = ["setuptools>=68"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "xt-cli"
-version = "0.2.1"
-description = "xt sdk command line tool"
-readme = "README.md"
-license = "Apache-2.0"
-requires-python = ">=3.10"
-dependencies = [
-  "json5>=0.10,<1",
-]
-authors = [
-  { name = "xt-sdk" }
-]
-classifiers = [
-  "Programming Language :: Python :: 3.12",
-]
-
-[project.scripts]
-xt = "cli:main"
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-py-modules = ["__init__", "__main__", "cli", "config", "constants", "context", "dependencies", "errors", "hooks", "models", "output", "paths", "project", "xmake", "xt_cli"]
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.pytest.ini_options]
-markers = [
-  "integration: 依赖真实 xmake 与工具链环境的集成测试",
-]
+[build-system]
+requires = ["setuptools>=68"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "xt-cli"
+version = "0.2.2"
+description = "xt sdk command line tool"
+readme = "README.md"
+license = "Apache-2.0"
+requires-python = ">=3.10"
+dependencies = [
+  "json5>=0.10,<1",
+]
+authors = [
+  { name = "xt-sdk" }
+]
+classifiers = [
+  "Programming Language :: Python :: 3.12",
+]
+
+[project.scripts]
+xt = "xt_cli.cli:main"
+
+[tool.setuptools]
+package-dir = {"xt_cli" = "src/xt_cli"}
+packages = ["xt_cli", "xt_cli.commands"]
+
+[tool.pytest.ini_options]
+markers = [
+  "integration: 依赖真实 xmake 与工具链环境的集成测试",
+]

xt_cli-0.2.2/src/xt_cli/__init__.py

@@ -0,0 +1,11 @@
+"""xt-cli package."""
+
+__all__ = ["__version__", "BuildContext", "run_lifecycle_hook", "print_step",
+           "build_command", "build_clean_command", "build_run_command", "run_xmake"]
+
+__version__ = "0.2.2"
+
+from .models import BuildContext
+from .hooks import run_lifecycle_hook
+from .output import print_step
+from .xmake import build_command, build_clean_command, build_run_command, run_xmake

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/__main__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from cli import main
+from xt_cli.cli import main
 
 
 if __name__ == "__main__":

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/cli.py

@@ -5,8 +5,8 @@ import sys
 from collections.abc import Callable
 from typing import Sequence
 
-from __init__ import __version__
-from errors import XtCliError
+from . import __version__
+from .errors import XtCliError
 
 _TASK_REGISTRY: dict[str, tuple[Callable[..., int], bool, Callable[[argparse.ArgumentParser], None] | None, str | None, str, int]] = {}
 _SCOPE_PARSERS: dict[str, Callable[[argparse.ArgumentParser], None]] = {}
@@ -174,8 +174,8 @@ def _sort_tasks(segments: list[tuple[str, list[str]]]) -> list[tuple[str, list[s
 
 def _discover_hook_tasks(parsed_args: argparse.Namespace) -> None:
     """扫描 hook 文件，自动注册自定义 task。"""
-    from context import build_context_from_options
-    from hooks import discover_hook_tasks
+    from .context import build_context_from_options
+    from .hooks import discover_hook_tasks
 
     try:
         context = build_context_from_options(
@@ -200,10 +200,10 @@ def _discover_hook_tasks(parsed_args: argparse.Namespace) -> None:
 
 def _register_hook_task(task_name: str, source: str = "project", add_parser: Callable[[argparse.ArgumentParser], None] | None = None, help_desc: str | None = None) -> None:
     """将 hook 中的 handle_<task> 封装为标准 handler 并注册。"""
-    from constants import PRIORITY_DEFAULT
+    from .constants import PRIORITY_DEFAULT
 
     def hook_handler(context, global_args: argparse.Namespace, shared_args: argparse.Namespace, self_args: argparse.Namespace, unknown_args: list[str]) -> int:
-        from hooks import dispatch_hook
+        from .hooks import dispatch_hook
 
         result = dispatch_hook(context, task_name, unknown_args,
                                global_args=global_args,
@@ -223,7 +223,7 @@ def _execute_tasks(
     segments: list[tuple[str, list[str]]],
 ) -> int:
     """按顺序执行 task 段，每段用 subparser 解析。"""
-    from context import build_context_from_options
+    from .context import build_context_from_options
 
     # 先逐段解析（--help 在此阶段触发 SystemExit，避免不必要的 context 构建）
     # 使用 bare parser（不含全局 option），确保 self_args 仅含 task 专属值
@@ -339,4 +339,4 @@ def main(argv: Sequence[str] | None = None) -> int:
         return 1
 
 # 导入命令模块触发 register_task 注册
-from commands import build_cmd, clean_cmd, config_cmd, deps_cmd, fullclean_cmd  # noqa: F401, E402
+from .commands import build_cmd, clean_cmd, config_cmd, deps_cmd, fullclean_cmd  # noqa: F401, E402

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/commands/build_cmd.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 import argparse
 
-from cli import register_task
-from hooks import dispatch_hook
-from models import BuildContext
-from output import print_step
-from xmake import build_command, run_xmake
+from ..cli import register_task
+from ..hooks import dispatch_hook
+from ..models import BuildContext
+from ..output import print_step
+from ..xmake import build_command, run_xmake
 
 
 def handle_build_command(context: BuildContext, global_args: argparse.Namespace, shared_args: argparse.Namespace, self_args: argparse.Namespace, unknown_args: list[str]) -> int:
@@ -14,12 +14,12 @@ def handle_build_command(context: BuildContext, global_args: argparse.Namespace,
     # --sync-deps: 在依赖检查之前 checkout 仓库
     sync_deps = getattr(global_args, "sync_deps", False)
     if sync_deps:
-        from dependencies import sync_dependencies
+        from ..dependencies import sync_dependencies
         dirty_allowed = getattr(global_args, "dirty", False)
         sync_dependencies(context, dirty_allowed=dirty_allowed)
 
     # 在 dispatch_hook 之前检查依赖版本（防止 hook 绕过）
-    from dependencies import check_dependencies, _print_warnings_box
+    from ..dependencies import check_dependencies, _print_warnings_box
     dirty_allowed = getattr(global_args, "dirty", False)
     strict = getattr(global_args, "strict", False)
     passed, warnings = check_dependencies(context, dirty_allowed=dirty_allowed, strict=strict)
@@ -30,7 +30,7 @@ def handle_build_command(context: BuildContext, global_args: argparse.Namespace,
     if hook_result.handled:
         return hook_result.returncode
 
-    from hooks import run_lifecycle_hook
+    from ..hooks import run_lifecycle_hook
 
     before_ret = run_lifecycle_hook(context, "before_build", unknown_args, global_args, shared_args, self_args)
     if before_ret != 0:
@@ -45,7 +45,7 @@ def handle_build_command(context: BuildContext, global_args: argparse.Namespace,
 
     # 在 after_build hook 之后更新版本追踪（反映最终仓库状态）
     if result.returncode == 0:
-        from dependencies import update_dependencies, _is_track_enabled
+        from ..dependencies import update_dependencies, _is_track_enabled
         no_track = getattr(global_args, "no_track", False)
         if not no_track and _is_track_enabled(context):
             update_dependencies(context)

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/commands/clean_cmd.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 import argparse
 
-from cli import register_task
-from hooks import dispatch_hook
-from models import BuildContext
-from output import print_step
-from xmake import build_clean_command, run_xmake
+from ..cli import register_task
+from ..hooks import dispatch_hook
+from ..models import BuildContext
+from ..output import print_step
+from ..xmake import build_clean_command, run_xmake
 
 
 def handle_clean_command(context: BuildContext, global_args: argparse.Namespace, shared_args: argparse.Namespace, self_args: argparse.Namespace, unknown_args: list[str]) -> int:
@@ -15,7 +15,7 @@ def handle_clean_command(context: BuildContext, global_args: argparse.Namespace,
     if hook_result.handled:
         return hook_result.returncode
 
-    from hooks import run_lifecycle_hook
+    from ..hooks import run_lifecycle_hook
 
     before_ret = run_lifecycle_hook(context, "before_clean", unknown_args, global_args, shared_args, self_args)
     if before_ret != 0:

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/commands/config_cmd.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import argparse
 from pathlib import Path
 
-from cli import register_task
-from config import get_config_value, reset_config_key, set_config_value
-from config import _resolve_config_store
-from constants import PRIORITY_INDEPENDENT
-from errors import CliUsageError
-from models import BuildContext
+from ..cli import register_task
+from ..config import get_config_value, reset_config_key, set_config_value
+from ..config import _resolve_config_store
+from ..constants import PRIORITY_INDEPENDENT
+from ..errors import CliUsageError
+from ..models import BuildContext
 
 
 def add_args_config(parser: argparse.ArgumentParser) -> None:
@@ -108,7 +108,7 @@ def _resolve_set_action(parsed_global: argparse.Namespace, parsed_task) -> tuple
 
 def _show_all_config(cwd: Path) -> None:
     """展示所有配置（分区：local / global / defaults）。"""
-    from config import _LOCAL_CONFIG_FILENAME
+    from ..config import _LOCAL_CONFIG_FILENAME
 
     local_store = _resolve_config_store(use_local=True, cwd=cwd, home=None)
     global_store = _resolve_config_store(use_local=False, cwd=cwd, home=None)

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/commands/deps_cmd.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 
 import argparse
 
-from cli import register_task
-from constants import PRIORITY_INDEPENDENT
-from models import BuildContext
-from dependencies import (
+from ..cli import register_task
+from ..constants import PRIORITY_INDEPENDENT
+from ..models import BuildContext
+from ..dependencies import (
     _get_entry_version, _load_jsonc, _print_error, _print_info,
     _resolve_repo_path, _save_jsonc, hash_dir,
 )
@@ -36,7 +36,7 @@ def handle_deps_command(
 ) -> int:
     if self_args.update_deps_require is not None:
         if context is None:
-            from context import build_context_from_options
+            from ..context import build_context_from_options
             context = build_context_from_options(
                 cwd=global_args.project,
                 project_dir=global_args.project,
@@ -116,7 +116,7 @@ def _resolve_entry_and_path(name: str, xt_deps: dict, context):
     if isinstance(components, dict):
         entry = components.get(name)
         if isinstance(entry, dict):
-            from dependencies import _resolve_component_path
+            from ..dependencies import _resolve_component_path
             repo_path = _resolve_component_path(name, entry, context)
             return entry, repo_path
 

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/commands/fullclean_cmd.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import argparse
 import shutil
 
-from cli import register_task
-from hooks import dispatch_hook
-from models import BuildContext
-from output import print_step
+from ..cli import register_task
+from ..hooks import dispatch_hook
+from ..models import BuildContext
+from ..output import print_step
 
 
 def handle_fullclean_command(context: BuildContext, global_args: argparse.Namespace, shared_args: argparse.Namespace, self_args: argparse.Namespace, unknown_args: list[str]) -> int:
@@ -15,7 +15,7 @@ def handle_fullclean_command(context: BuildContext, global_args: argparse.Namesp
     if hook_result.handled:
         return hook_result.returncode
 
-    from hooks import run_lifecycle_hook
+    from ..hooks import run_lifecycle_hook
 
     before_ret = run_lifecycle_hook(context, "before_fullclean", unknown_args, global_args, shared_args, self_args)
     if before_ret != 0:

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/config.py

@@ -6,9 +6,9 @@ from typing import Any
 
 import json5
 
-from constants import CONFIG_VERSION, DEFAULT_TARGET
-from errors import ConfigError
-from paths import build_global_config_path, normalize_path
+from .constants import CONFIG_VERSION, DEFAULT_TARGET
+from .errors import ConfigError
+from .paths import build_global_config_path, normalize_path
 
 _LOCAL_CONFIG_FILENAME = "xt_conf.jsonc"
 _TOOLCHAINS_KEY = "toolchains"

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/context.py

@@ -4,11 +4,11 @@ import os
 from pathlib import Path
 from typing import Any
 
-from config import ConfigStore
-from errors import ConfigError, ProjectError
-from models import BuildContext, ConfigSource, ResolvedValue
-from paths import build_global_config_path, normalize_path, resolve_platform_name, resolve_target_path
-from project import has_xmake_project, has_xt_main_target
+from .config import ConfigStore
+from .errors import ConfigError, ProjectError
+from .models import BuildContext, ConfigSource, ResolvedValue
+from .paths import build_global_config_path, normalize_path, resolve_platform_name, resolve_target_path
+from .project import has_xmake_project, has_xt_main_target
 
 _DEFAULT_TARGET = "windows/simulator"
 _LOCAL_CONFIG_FILENAME = "xt_conf.jsonc"

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/dependencies.py

@@ -13,8 +13,8 @@ from typing import Any
 
 import json5
 
-from config import ConfigStore
-from paths import build_global_config_path
+from .config import ConfigStore
+from .paths import build_global_config_path
 
 
 def _get_git_version(repo_path: Path) -> tuple[str, bool]:

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/hooks.py

@@ -7,8 +7,8 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
 
-from models import BuildContext
-from output import print_step
+from .models import BuildContext
+from .output import print_step
 
 _BUILTIN_TASKS = {"build", "clean", "fullclean"}
 
@@ -150,7 +150,7 @@ def _run_builtin_task(
         self_args = argparse.Namespace()
 
     if task == "build":
-        from xmake import build_command, run_xmake
+        from .xmake import build_command, run_xmake
 
         before_ret = run_lifecycle_hook(context, "before_build", unknown_args, global_args, shared_args, self_args)
         if before_ret != 0:
@@ -163,7 +163,7 @@ def _run_builtin_task(
         run_lifecycle_hook(context, "after_build", unknown_args, global_args, shared_args, self_args)
         return build_ret
     elif task == "clean":
-        from xmake import build_clean_command, run_xmake
+        from .xmake import build_clean_command, run_xmake
 
         before_ret = run_lifecycle_hook(context, "before_clean", unknown_args, global_args, self_args)
         if before_ret != 0:

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/models.py

@@ -62,7 +62,7 @@ class BuildContext:
         自动从当前 handler 的 dispatch 上下文读取 global_args/shared_args 等，
         调用方无需显式传入。同 task 递归时跳过 hook，直接执行内置行为。
         """
-        from hooks import _BUILTIN_TASKS, _run_builtin_task, dispatch_hook
+        from .hooks import _BUILTIN_TASKS, _run_builtin_task, dispatch_hook
 
         dispatch = getattr(self, "_dispatch_args", None)
         if global_args is None and dispatch is not None:

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/paths.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from errors import TargetResolveError
+from .errors import TargetResolveError
 
 
 GLOBAL_CONFIG_DIRNAME = ".xt"

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/project.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from paths import normalize_path
+from .paths import normalize_path
 
 _XMAKE_FILENAME = "xmake.lua"
 _XT_MAIN_MARKER = "xt_main"

{xt_cli-0.2.1/src → xt_cli-0.2.2/src/xt_cli}/xmake.py

@@ -4,7 +4,7 @@ import os
 import subprocess
 from pathlib import Path
 
-from models import BuildContext, ConfigSource, ResolvedValue
+from .models import BuildContext, ConfigSource, ResolvedValue
 
 
 def _xmake_file(context: BuildContext) -> Path:

{xt_cli-0.2.1 → xt_cli-0.2.2/xt_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xt-cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: xt sdk command line tool
 Author: xt-sdk
 License-Expression: Apache-2.0

xt_cli-0.2.2/xt_cli.egg-info/SOURCES.txt

@@ -0,0 +1,29 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+src/xt_cli/__init__.py
+src/xt_cli/__main__.py
+src/xt_cli/cli.py
+src/xt_cli/config.py
+src/xt_cli/constants.py
+src/xt_cli/context.py
+src/xt_cli/dependencies.py
+src/xt_cli/errors.py
+src/xt_cli/hooks.py
+src/xt_cli/models.py
+src/xt_cli/output.py
+src/xt_cli/paths.py
+src/xt_cli/project.py
+src/xt_cli/xmake.py
+src/xt_cli/commands/build_cmd.py
+src/xt_cli/commands/clean_cmd.py
+src/xt_cli/commands/config_cmd.py
+src/xt_cli/commands/deps_cmd.py
+src/xt_cli/commands/fullclean_cmd.py
+xt_cli.egg-info/PKG-INFO
+xt_cli.egg-info/SOURCES.txt
+xt_cli.egg-info/dependency_links.txt
+xt_cli.egg-info/entry_points.txt
+xt_cli.egg-info/requires.txt
+xt_cli.egg-info/top_level.txt

xt_cli-0.2.2/xt_cli.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+xt = xt_cli.cli:main

xt_cli-0.2.2/xt_cli.egg-info/top_level.txt

@@ -0,0 +1 @@
+xt_cli

xt_cli-0.2.1/src/__init__.py

@@ -1,5 +0,0 @@
-"""xt-cli package."""
-
-__all__ = ["__version__"]
-
-__version__ = "0.2.1"

xt_cli-0.2.1/src/xt_cli.egg-info/SOURCES.txt

@@ -1,30 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-src/__init__.py
-src/__main__.py
-src/cli.py
-src/config.py
-src/constants.py
-src/context.py
-src/dependencies.py
-src/errors.py
-src/hooks.py
-src/models.py
-src/output.py
-src/paths.py
-src/project.py
-src/xmake.py
-src/xt_cli.py
-src/commands/build_cmd.py
-src/commands/clean_cmd.py
-src/commands/config_cmd.py
-src/commands/deps_cmd.py
-src/commands/fullclean_cmd.py
-src/xt_cli.egg-info/PKG-INFO
-src/xt_cli.egg-info/SOURCES.txt
-src/xt_cli.egg-info/dependency_links.txt
-src/xt_cli.egg-info/entry_points.txt
-src/xt_cli.egg-info/requires.txt
-src/xt_cli.egg-info/top_level.txt

xt_cli-0.2.1/src/xt_cli.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-xt = cli:main

xt_cli-0.2.1/src/xt_cli.egg-info/top_level.txt

@@ -1,16 +0,0 @@
-__init__
-__main__
-cli
-commands
-config
-constants
-context
-dependencies
-errors
-hooks
-models
-output
-paths
-project
-xmake
-xt_cli

xt_cli-0.2.1/src/xt_cli.py

@@ -1,10 +0,0 @@
-"""xt-cli 公共 API 模块。
-
-面向 xt_hook.py 作者，提供稳定接口。
-xt-cli 内部重构不影响此模块导出。
-"""
-
-from models import BuildContext
-from hooks import run_lifecycle_hook
-from output import print_step
-from xmake import build_command, build_clean_command, build_run_command, run_xmake