zhou/pyflowx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 统一格式化代码中的多行列表与函数调用

Browse Source 
对多处代码进行了统一的多行列表和函数调用进行格式化调整，包括将单行代码拆分为多行以提升可读性。
This commit is contained in:
gooker_young
2026-06-22 11:45:10 +08:00
parent 48f6d8a7f0
commit 843e9369fe
29 changed files with 419 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/cli/test_packtool.py
+44 -46
View File
@@ -3,7 +3,7 @@
from __future__ import annotations
from pathlib import Path
from unittest.mock import patch, MagicMock
from unittest.mock import MagicMock, patch
import pytest
@@ -34,7 +34,7 @@ class TestPackSource:
project_dir.mkdir()
output_dir = tmp_path / "output"
with patch("shutil.make_archive") as mock_archive:
with patch("shutil.make_archive"):
packtool.pack_source(project_dir, output_dir)
assert output_dir.exists()
@@ -107,8 +107,7 @@ class TestInstallEmbedPython:
"""Should install embedded Python with version."""
output_dir = tmp_path / "python"
with patch("subprocess.run") as mock_run, \
patch.object(Path, "exists", return_value=False):
with patch("subprocess.run") as mock_run, patch.object(Path, "exists", return_value=False):
mock_run.return_value = MagicMock(returncode=0)
packtool.install_embed_python("3.10", output_dir)
assert mock_run.called
@@ -117,8 +116,7 @@ class TestInstallEmbedPython:
"""Should create output directory if it doesn't exist."""
output_dir = tmp_path / "python"
with patch("subprocess.run") as mock_run, \
patch.object(Path, "exists", return_value=False):
with patch("subprocess.run") as mock_run, patch.object(Path, "exists", return_value=False):
mock_run.return_value = MagicMock(returncode=0)
packtool.install_embed_python("3.10", output_dir)
assert output_dir.exists()
@@ -185,89 +183,89 @@ class TestMain:
def test_main_src_default_dirs(self) -> None:
"""main() should handle src command with default dirs."""
with patch("sys.argv", ["packtool", "src"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_source"):
with patch("sys.argv", ["packtool", "src"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "pack_source"
):
packtool.main()
assert mock_run.called
def test_main_src_custom_dirs(self) -> None:
"""main() should handle src command with custom dirs."""
with patch("sys.argv", ["packtool", "src", "--project-dir", "project", "--output-dir", "output"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_source"):
with patch("sys.argv", ["packtool", "src", "--project-dir", "project", "--output-dir", "output"]), patch.object(
px, "run"
) as mock_run, patch.object(packtool, "pack_source"):
packtool.main()
assert mock_run.called
def test_main_deps_default_dir(self) -> None:
"""main() should handle deps command with default dir."""
with patch("sys.argv", ["packtool", "deps"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_dependencies"):
with patch("sys.argv", ["packtool", "deps"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "pack_dependencies"
):
packtool.main()
assert mock_run.called
def test_main_deps_with_dependencies(self) -> None:
"""main() should handle deps command with dependencies."""
with patch("sys.argv", ["packtool", "deps", "--lib-dir", "lib", "numpy", "pandas"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_dependencies"):
with patch("sys.argv", ["packtool", "deps", "--lib-dir", "lib", "numpy", "pandas"]), patch.object(
px, "run"
) as mock_run, patch.object(packtool, "pack_dependencies"):
packtool.main()
assert mock_run.called
def test_main_wheel_default_dirs(self) -> None:
"""main() should handle wheel command with default dirs."""
with patch("sys.argv", ["packtool", "wheel"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_wheel"):
with patch("sys.argv", ["packtool", "wheel"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "pack_wheel"
):
packtool.main()
assert mock_run.called
def test_main_wheel_custom_dirs(self) -> None:
"""main() should handle wheel command with custom dirs."""
with patch("sys.argv", ["packtool", "wheel", "--project-dir", "project", "--output-dir", "output"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_wheel"):
with patch(
"sys.argv", ["packtool", "wheel", "--project-dir", "project", "--output-dir", "output"]
), patch.object(px, "run") as mock_run, patch.object(packtool, "pack_wheel"):
packtool.main()
assert mock_run.called
def test_main_embed_default_version(self) -> None:
"""main() should handle embed command with default version."""
with patch("sys.argv", ["packtool", "embed"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "install_embed_python"):
with patch("sys.argv", ["packtool", "embed"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "install_embed_python"
):
packtool.main()
assert mock_run.called
def test_main_embed_custom_version(self) -> None:
"""main() should handle embed command with custom version."""
with patch("sys.argv", ["packtool", "embed", "--version", "3.11", "--output-dir", "python"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "install_embed_python"):
with patch("sys.argv", ["packtool", "embed", "--version", "3.11", "--output-dir", "python"]), patch.object(
px, "run"
) as mock_run, patch.object(packtool, "install_embed_python"):
packtool.main()
assert mock_run.called
def test_main_zip_default_params(self) -> None:
"""main() should handle zip command with default params."""
with patch("sys.argv", ["packtool", "zip"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "create_zip_package"):
with patch("sys.argv", ["packtool", "zip"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "create_zip_package"
):
packtool.main()
assert mock_run.called
def test_main_zip_custom_params(self) -> None:
"""main() should handle zip command with custom params."""
with patch("sys.argv", ["packtool", "zip", "--source-dir", "source", "--output-file", "package.zip"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "create_zip_package"):
with patch(
"sys.argv", ["packtool", "zip", "--source-dir", "source", "--output-file", "package.zip"]
), patch.object(px, "run") as mock_run, patch.object(packtool, "create_zip_package"):
packtool.main()
assert mock_run.called
def test_main_clean(self) -> None:
"""main() should handle clean command."""
with patch("sys.argv", ["packtool", "clean"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "clean_build_dir"):
with patch("sys.argv", ["packtool", "clean"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "clean_build_dir"
):
packtool.main()
assert mock_run.called
@@ -279,9 +277,9 @@ class TestMain:
def test_main_creates_task_spec_with_correct_name(self) -> None:
"""main() should create TaskSpec with correct name."""
with patch("sys.argv", ["packtool", "src"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_source"):
with patch("sys.argv", ["packtool", "src"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "pack_source"
):
packtool.main()
graph = mock_run.call_args[0][0]
task_names = list(graph.all_specs().keys())
@@ -289,8 +287,8 @@ class TestMain:
def test_main_uses_thread_strategy(self) -> None:
"""main() should use thread strategy."""
with patch("sys.argv", ["packtool", "src"]), \
patch.object(px, "run") as mock_run, \
patch.object(packtool, "pack_source"):
with patch("sys.argv", ["packtool", "src"]), patch.object(px, "run") as mock_run, patch.object(
packtool, "pack_source"
):
packtool.main()
assert mock_run.call_args[1]["strategy"] == "thread"
assert mock_run.call_args[1]["strategy"] == "thread"