cli-test-framework 0.4.2__tar.gz → 0.4.4__tar.gz

{cli_test_framework-0.4.2/src/cli_test_framework.egg-info → cli_test_framework-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-test-framework
-Version: 0.4.2
+Version: 0.4.4
 Summary: A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.
 Home-page: https://github.com/ozil111/cli-test-framework
 Author: Xiaotong Wang
@@ -19,7 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: dukpy==0.5.0
 Requires-Dist: h5py>=3.8.0
-Requires-Dist: numpy>=2.0.1
+Requires-Dist: numpy>=1.22.0
 Requires-Dist: setuptools>=75.8.0
 Requires-Dist: wheel>=0.45.1
 Dynamic: author

{cli_test_framework-0.4.2 → cli_test_framework-0.4.4}/setup.py

@@ -8,7 +8,7 @@ with open(os.path.join(this_directory, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name="cli-test-framework",
-    version="0.4.2",
+    version="0.4.4",
     author="Xiaotong Wang",
     author_email="xiaotongwang98@gmail.com",
     description="A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.",
@@ -20,7 +20,7 @@ setup(
     install_requires=[
         "dukpy==0.5.0",
         "h5py>=3.8.0",
-        "numpy>=2.0.1",
+        "numpy>=1.22.0",
         "setuptools>=75.8.0",
         "wheel>=0.45.1"
     ],

{cli_test_framework-0.4.2 → cli_test_framework-0.4.4}/src/cli_test_framework/__init__.py

@@ -5,7 +5,7 @@ This package provides tools for testing command-line applications and scripts
 with support for parallel execution and advanced file comparison capabilities.
 """
 
-__version__ = "0.3.7"
+__version__ = "0.4.3"
 __author__ = "Xiaotong Wang"
 __email__ = "xiaotongwang98@gmail.com"
 

{cli_test_framework-0.4.2 → cli_test_framework-0.4.4}/src/cli_test_framework/runners/parallel_json_runner.py

@@ -46,6 +46,36 @@ class ParallelJSONRunner(ParallelRunner):
         
         print(f"✅ [Resource Manager] Detected {self.total_physical} CPUs. Pool size set to {self.safe_capacity}.")
 
+    def _assign_relative_cpu_cores(self) -> None:
+        """
+        If cpu_cores is unset, allocate proportionally based on estimated_time/min_memory_mb
+        across all cases, relative to available safe_capacity.
+        """
+        candidates = [c for c in self.test_cases if not (c.resources and "cpu_cores" in c.resources)]
+        if not candidates:
+            return
+
+        def weight(case: TestCase) -> float:
+            res = case.resources or {}
+            est = float(res.get("estimated_time") or 0)
+            mem = float(res.get("min_memory_mb") or 0)
+            # Simple additive weight; keep >=1 to avoid zero allocation.
+            return max(1.0, est / 3600.0 + mem / 4000.0)
+
+        weights = [weight(c) for c in candidates]
+        total_weight = sum(weights)
+        if total_weight <= 0:
+            total_weight = float(len(weights))  # uniform
+
+        remaining = self.safe_capacity
+        for case, w in zip(candidates, weights):
+            share = max(1, int(round(self.safe_capacity * (w / total_weight))))
+            share = min(self.safe_capacity, max(1, min(share, remaining))) if remaining > 0 else 1
+            if not case.resources:
+                case.resources = {}
+            case.resources["cpu_cores"] = share
+            remaining = max(0, remaining - share)
+
     def load_test_cases(self) -> None:
         """从JSON文件加载测试用例"""
         try:
@@ -77,6 +107,9 @@ class ParallelJSONRunner(ParallelRunner):
                 top_case = self.test_cases[0]
                 top_est = (top_case.resources or {}).get("estimated_time", 0)
                 print(f"Heaviest task: {top_case.name} (Est: {top_est}s)")
+
+            # Relative CPU allocation for cases without explicit cpu_cores
+            self._assign_relative_cpu_cores()
         except Exception as e:
             sys.exit(f"Failed to load configuration file: {str(e)}")
 

{cli_test_framework-0.4.2 → cli_test_framework-0.4.4}/src/cli_test_framework/utils/path_resolver.py

@@ -11,19 +11,34 @@ def _as_workspace_path(workspace: WorkspaceLike) -> Path:
     return workspace if isinstance(workspace, Path) else Path(workspace)
 
 
+def _resolve_relative_part(part: str, workspace_path: Path) -> str:
+    """
+    带标识符的路径解析逻辑：
+    1. 检查标识符 'raw:' -> 如果存在，强行按原样返回（剥离标识符）
+    2. 跳过旗标 (- 开头)
+    3. 跳过纯数字
+    4. 启发式解析其他潜在路径
+    """
+    if part.startswith("raw:"):
+        return part[4:]
+
+    if part.startswith("-"):
+        return part
+
+    if part.isdigit():
+        return part
+
+    if "." in part or "/" in part or "\\" in part:
+        if not Path(part).is_absolute():
+            return str(workspace_path / part)
+
+    return part
+
+
 def resolve_paths(args: List[str], workspace: WorkspaceLike) -> List[str]:
-    """Resolve relative paths in args against the workspace."""
+    """根据标识符或启发式规则解析参数列表中的路径"""
     workspace_path = _as_workspace_path(workspace)
-    resolved_args = []
-    for arg in args:
-        if not arg.startswith("--"):
-            if not Path(arg).is_absolute():
-                resolved_args.append(str(workspace_path / arg))
-            else:
-                resolved_args.append(arg)
-        else:
-            resolved_args.append(arg)
-    return resolved_args
+    return [_resolve_relative_part(arg, workspace_path) for arg in args]
 
 
 def resolve_command(command: str, workspace: WorkspaceLike) -> str:
@@ -71,40 +86,24 @@ def parse_command_string(command_string: str, workspace: WorkspaceLike) -> str:
             command_part = parts[0]
             remaining_parts = parts[1:]
 
-            if Path(command_part).is_absolute():
-                resolved_command = command_part
-            else:
-                resolved_command = resolve_command(command_part, workspace_path)
+            resolved_command = (
+                command_part
+                if Path(command_part).is_absolute()
+                else resolve_command(command_part, workspace_path)
+            )
 
-            # Preserve scripts passed via "-c" as a single argument to avoid losing quotes
             resolved_parts = []
             if "-c" in remaining_parts:
                 c_index = remaining_parts.index("-c")
                 before_c = remaining_parts[:c_index]
                 script_body = " ".join(remaining_parts[c_index + 1 :])
                 for part in before_c:
-                    if part.startswith("-"):
-                        resolved_parts.append(part)
-                    elif ('.' in part or '/' in part or '\\' in part) and not part.isdigit():
-                        if not Path(part).is_absolute():
-                            resolved_parts.append(str(workspace_path / part))
-                        else:
-                            resolved_parts.append(part)
-                    else:
-                        resolved_parts.append(part)
+                    resolved_parts.append(_resolve_relative_part(part, workspace_path))
                 resolved_parts.append("-c")
                 resolved_parts.append(script_body)
             else:
                 for part in remaining_parts:
-                    if part.startswith('-'):
-                        resolved_parts.append(part)
-                    elif ('.' in part or '/' in part or '\\' in part) and not part.isdigit():
-                        if not Path(part).is_absolute():
-                            resolved_parts.append(str(workspace_path / part))
-                        else:
-                            resolved_parts.append(part)
-                    else:
-                        resolved_parts.append(part)
+                    resolved_parts.append(_resolve_relative_part(part, workspace_path))
 
             return f"{resolved_command} {' '.join(resolved_parts)}"
 
@@ -123,26 +122,19 @@ def parse_command_string(command_string: str, workspace: WorkspaceLike) -> str:
         else:
             command_part = parts[0]
             remaining_parts = parts[1:]
-
             resolved_command = resolve_command(command_part, workspace_path)
 
             if "-c" in remaining_parts:
                 c_index = remaining_parts.index("-c")
                 before_c = remaining_parts[:c_index]
                 script_body = " ".join(remaining_parts[c_index + 1 :])
-                resolved_parts = before_c + ["-c", script_body]
+                resolved_parts = [
+                    _resolve_relative_part(p, workspace_path) for p in before_c
+                ] + ["-c", script_body]
             else:
-                resolved_parts = []
-                for part in remaining_parts:
-                    if part.startswith('-'):
-                        resolved_parts.append(part)
-                    elif ('.' in part or '/' in part or '\\' in part) and not part.isdigit():
-                        if not Path(part).is_absolute():
-                            resolved_parts.append(str(workspace_path / part))
-                        else:
-                            resolved_parts.append(part)
-                    else:
-                        resolved_parts.append(part)
+                resolved_parts = [
+                    _resolve_relative_part(p, workspace_path) for p in remaining_parts
+                ]
 
             return f"{resolved_command} {' '.join(resolved_parts)}"
 
@@ -172,19 +164,10 @@ def _parse_absolute_path_command(command_string: str, workspace: WorkspaceLike)
 
                     if remaining:
                         remaining_parts = remaining.split()
-                        resolved_parts = []
-
-                        for part in remaining_parts:
-                            if part.startswith('-'):
-                                resolved_parts.append(part)
-                            elif ('.' in part or '/' in part or '\\' in part) and not part.isdigit():
-                                if not Path(part).is_absolute():
-                                    resolved_parts.append(str(workspace_path / part))
-                                else:
-                                    resolved_parts.append(part)
-                            else:
-                                resolved_parts.append(part)
-
+                        resolved_parts = [
+                            _resolve_relative_part(p, workspace_path)
+                            for p in remaining_parts
+                        ]
                         return f"{command_part} {' '.join(resolved_parts)}"
                     else:
                         return command_part
@@ -196,18 +179,9 @@ def _parse_absolute_path_command(command_string: str, workspace: WorkspaceLike)
     command_part = parts[0]
     remaining_parts = parts[1:]
 
-    resolved_parts = []
-    for part in remaining_parts:
-        if part.startswith('-'):
-            resolved_parts.append(part)
-        elif ('.' in part or '/' in part or '\\' in part) and not part.isdigit():
-            if not Path(part).is_absolute():
-                resolved_parts.append(str(workspace_path / part))
-            else:
-                resolved_parts.append(part)
-        else:
-            resolved_parts.append(part)
-
+    resolved_parts = [
+        _resolve_relative_part(p, workspace_path) for p in remaining_parts
+    ]
     return f"{command_part} {' '.join(resolved_parts)}"
 
 

{cli_test_framework-0.4.2 → cli_test_framework-0.4.4/src/cli_test_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-test-framework
-Version: 0.4.2
+Version: 0.4.4
 Summary: A powerful command line testing framework in Python with setup modules, parallel execution, and file comparison capabilities.
 Home-page: https://github.com/ozil111/cli-test-framework
 Author: Xiaotong Wang
@@ -19,7 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: dukpy==0.5.0
 Requires-Dist: h5py>=3.8.0
-Requires-Dist: numpy>=2.0.1
+Requires-Dist: numpy>=1.22.0
 Requires-Dist: setuptools>=75.8.0
 Requires-Dist: wheel>=0.45.1
 Dynamic: author

{cli_test_framework-0.4.2 → cli_test_framework-0.4.4}/src/cli_test_framework.egg-info/requires.txt

@@ -1,5 +1,5 @@
 dukpy==0.5.0
 h5py>=3.8.0
-numpy>=2.0.1
+numpy>=1.22.0
 setuptools>=75.8.0
 wheel>=0.45.1