removal of tests

Author: luciasanchezbella01

ddev/src/ddev/cli/size/historical_metrics.py

@@ -35,7 +35,9 @@ def upload_historical_metrics(DATE_FROM: str, ORG: str) -> None:
 
                 for i, commit in enumerate(commits, 1):
                     date, _, _ = gitRepo.get_commit_metadata(commit)
-                    progress.update(commit_task, description=f"Processing commit {i}/{len(commits)}: {commit[:8]} ({date})")
+                    progress.update(
+                        commit_task, description=f"Processing commit {i}/{len(commits)}: {commit[:8]} ({date})"
+                    )
                     gitRepo.checkout_commit(commit)
 
                     result = subprocess.run(
@@ -44,17 +46,19 @@ def upload_historical_metrics(DATE_FROM: str, ORG: str) -> None:
                         text=True,
                         capture_output=True,
                     )
-                    # print("[UNCOMP STDOUT]", result.stdout)
-                    # print("[UNCOMP STDERR]", result.stderr)
+                    if result.returncode != 0:
+                        console.print(f"[red]Error in commit {commit}: {result.stderr}")
+                        continue
 
                     result = subprocess.run(
                         ["ddev", "size", "status", "--compressed", "--to-dd-org", ORG],
                         cwd=gitRepo.repo_dir,
                         text=True,
                         capture_output=True,
                     )
-                    # print("[COMP STDOUT]", result.stdout)
-                    # print("[COMP STDERR]", result.stderr)
+                    if result.returncode != 0:
+                        console.print(f"[red]Error in commit {commit}: {result.stderr}")
+                        continue
 
                     progress.advance(commit_task)
                 progress.update(commit_task, description="[green]All commits processed!")

ddev/src/ddev/cli/size/utils/common_funcs.py

@@ -279,14 +279,15 @@ def get_dependencies_sizes(
             wheel_data = response.content
 
         with tempfile.TemporaryDirectory() as tmpdir:
-            wheel_path = Path(tmpdir) / "package.whl"
+            wheel_path = Path(tmpdir) / "package"
             with open(wheel_path, "wb") as f:
                 f.write(wheel_data)
-
             if compressed:
                 with zipfile.ZipFile(wheel_path, "r") as zip_ref:
                     size = sum(
-                        zinfo.compress_size for zinfo in zip_ref.infolist() if "test" not in zinfo.filename.lower()
+                        zinfo.compress_size
+                        for zinfo in zip_ref.infolist()
+                        if not is_excluded_from_wheel(zinfo.filename)
                     )
             else:
                 extract_path = Path(tmpdir) / "extracted"
@@ -295,12 +296,14 @@ def get_dependencies_sizes(
 
                 size = 0
                 for dirpath, _, filenames in os.walk(extract_path):
-                    if "test" in dirpath.lower():
+                    rel_dir = os.path.relpath(dirpath, extract_path)
+                    if is_excluded_from_wheel(rel_dir):
                         continue
                     for name in filenames:
-                        if "test" in name.lower():
+                        file_path = os.path.join(dirpath, name)  # solo si es blob??
+                        rel_file = os.path.relpath(file_path, extract_path)
+                        if is_excluded_from_wheel(rel_file):
                             continue
-                        file_path = os.path.join(dirpath, name)
                         size += os.path.getsize(file_path)
 
         file_data.append(
@@ -316,6 +319,58 @@ def get_dependencies_sizes(
     return file_data
 
 
+def is_excluded_from_wheel(path: str) -> bool:
+    excluded_test_paths = [
+        os.path.normpath(path)
+        for path in [
+            'idlelib/idle_test',
+            'bs4/tests',
+            'Cryptodome/SelfTest',
+            'gssapi/tests',
+            'keystoneauth1/tests',
+            'openstack/tests',
+            'os_service_types/tests',
+            'pbr/tests',
+            'pkg_resources/tests',
+            'psutil/tests',
+            'securesystemslib/_vendor/ed25519/test_data',
+            'setuptools/_distutils/tests',
+            'setuptools/tests',
+            'simplejson/tests',
+            'stevedore/tests',
+            'supervisor/tests',
+            'test',  # cm-client
+            'vertica_python/tests',
+            'websocket/tests',
+        ]
+    ]
+
+    type_annot_libraries = [
+        'krb5',
+        'Cryptodome',
+        'ddtrace',
+        'pyVmomi',
+        'gssapi',
+    ]
+    # print('path:', path)
+    rel_path = Path(path).as_posix()
+
+    # Test folders
+    for test_folder in excluded_test_paths:
+        if rel_path == test_folder or rel_path.startswith(test_folder + '/'):
+            return True
+
+    # Python type annotations
+    path_parts = Path(rel_path).parts
+    if path_parts:
+        dependency_name = path_parts[0]
+        if dependency_name in type_annot_libraries:
+            if path.endswith('.pyi') or os.path.basename(path) == 'py.typed':
+                return True
+
+    return False
+
+
 def format_modules(
     modules: list[FileDataEntry],
     platform: str,
@@ -459,9 +514,7 @@ def export_format(
                 else (
                     f"{version}_{size_type}_{mode}.csv"
                     if version
-                    else f"{platform}_{size_type}_{mode}.csv"
-                    if platform
-                    else f"{size_type}_{mode}.csv"
+                    else f"{platform}_{size_type}_{mode}.csv" if platform else f"{size_type}_{mode}.csv"
                 )
             )
             save_csv(app, modules, csv_filename)
@@ -473,9 +526,7 @@ def export_format(
                 else (
                     f"{version}_{size_type}_{mode}.json"
                     if version
-                    else f"{platform}_{size_type}_{mode}.json"
-                    if platform
-                    else f"{size_type}_{mode}.json"
+                    else f"{platform}_{size_type}_{mode}.json" if platform else f"{size_type}_{mode}.json"
                 )
             )
             save_json(app, json_filename, modules)
@@ -487,9 +538,7 @@ def export_format(
                 else (
                     f"{version}_{size_type}_{mode}.md"
                     if version
-                    else f"{platform}_{size_type}_{mode}.md"
-                    if platform
-                    else f"{size_type}_{mode}.md"
+                    else f"{platform}_{size_type}_{mode}.md" if platform else f"{size_type}_{mode}.md"
                 )
             )
             save_markdown(app, "Status", modules, markdown_filename)