Merge branch 'main' into task/SAT-8497

ndgrigorian · web-flow · commit 08bef4e41f7d · 2026-06-18T07:53:09.000-07:00
diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json
@@ -6,7 +6,11 @@
     "branches": [
         "main"
     ],
-    "environment_type": "existing",
+    "environment_type": "conda",
+    "conda_channels": [
+        "https://software.repos.intel.com/python/conda/",
+        "conda-forge"
+    ],
     "benchmark_dir": "benchmarks",
     "env_dir": ".asv/env",
     "results_dir": ".asv/results",
diff --git a/benchmarks/requirements.txt b/benchmarks/requirements.txt
@@ -0,0 +1 @@
+psutil
