ci: remove svgo

Signed-off-by: Zxilly <[email protected]>

.github/actions/setup-script/action.yml

@@ -36,11 +36,6 @@ runs:
       run: |
         poetry install
 
-    - name: Install svgo
-      if: ${{ inputs.report == 'true' }}
-      shell: bash
-      run: npm install -g svgo
-
     - name: Install Go tools
       shell: bash
       if: ${{ inputs.coverage == 'true' }}

DEVELOPMENT.md

@@ -115,12 +115,10 @@ python scripts/generate.py
 
 Collect the test results and generate a report in GitHub Actions format.
 
-Requires `svgo` to be installed to optimize the SVG files.
-
 It uses service [Zxilly/data2image](https://github.com/Zxilly/data2image) to bypass
 GitHub data-uri limit. This project was written in `Rust`.
 
-The svg data was optimized with `svgo` then compressed with `zstd` and encoded with `base64`
+The svg data was optimized then compressed with `zstd` and encoded with `base64`
 for safe inclusion in the url.
 
 ```bash

scripts/pgo.py

@@ -46,8 +46,6 @@ def merge_profiles():
 if __name__ == '__main__':
     shutil.rmtree(os.path.join(get_project_root(), "results"), ignore_errors=True)
 
-    tool.gsa.DISABLE_DRAW = True
-
     with build_pgo_gsa() as gsa:
         run_integration_tests("real", gsa)
     merge_profiles()

scripts/pyproject.toml

@@ -13,6 +13,7 @@ tqdm = "^4.66.5"
 matplotlib = "3.9.0"
 psutil = "^6.0.0"
 markdown-strings = "^3.4.0"
+scour = "^0.38.2"
 
 [tool.poetry.group.research]
 optional = true

scripts/tool/gsa.py

@@ -53,9 +53,6 @@ def build_pgo_gsa():
     os.remove(temp_binary)
 
 
-DISABLE_DRAW = False
-
-
 class GSAInstance:
     def __init__(self, binary: str):
         self.binary = binary

scripts/tool/process.py

@@ -5,7 +5,6 @@
 
 import psutil
 
-from .gsa import DISABLE_DRAW
 from .matplotlib import draw_usage
 from .utils import get_covdata_integration_dir, get_project_root
 
@@ -16,8 +15,6 @@ def run_process(
         timeout=240,
         profiler_dir: str = None,
         draw: bool = False) -> [str, bytes | None]:
-    if DISABLE_DRAW:
-        draw = False
 
     env = os.environ.copy()
     env["GOCOVERDIR"] = get_covdata_integration_dir()

scripts/tool/svgo.py

@@ -1,25 +1,5 @@
-import shutil
-import subprocess
-
-
-def require_svgo() -> str:
-    svgo = shutil.which("svgo")
-    if svgo is None:
-        raise Exception("svgo is required to optimize SVG files.")
-    return svgo
+from scour import scour
 
 
 def optimize_svg(d: str) -> str:
-    # svgo -i - -o -
-    return subprocess.check_output(
-        args=[
-            require_svgo(),
-            "-i",
-            "-",
-            "-o",
-            "-",
-            "--multipass",
-        ],
-        input=d,
-        text=True,
-    )
+    return scour.scourString(d)