From bbc536ead07221fdf23ca2c2681e04ab7c8fb9ed Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 19 Nov 2026 23:49:47 +0100 Subject: [PATCH 1/2] Bump mozci to 2.6.1 mozci 2.6.1 fixes get_configuration, which read the test variants of tasks from "test-settings" instead of the "test-setting" of the task graph, so it lost them (e.g. "-swr"). --- pyproject.toml | 2 +- uv.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 71d6540af9..2ed50ea5df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ dependencies = [ "matplotlib>=3.10.8,<3.12.0", "mercurial~=7.2", "microannotate~=0.0.24", - "mozci~=2.6.0", + "mozci~=2.6.1", "numpy>=2.4.3,<2.6.0", "orjson>=3.11.7,<3.14.0", "ortools~=9.15.6755", diff --git a/uv.lock b/uv.lock index 6dc51d4a2a..cf319b9699 100644 --- a/uv.lock +++ b/uv.lock @@ -749,7 +749,7 @@ requires-dist = [ { name = "matplotlib", specifier = ">=3.10.8,<3.12.0" }, { name = "mercurial", specifier = "~=7.2" }, { name = "microannotate", specifier = "~=0.0.24" }, - { name = "mozci", specifier = "~=2.6.0" }, + { name = "mozci", specifier = "~=2.6.1" }, { name = "numpy", specifier = ">=2.4.3,<2.6.0" }, { name = "optuna", marker = "extra == 'perf-simulation'", specifier = ">=5.0.0" }, { name = "orjson", specifier = ">=3.11.7,<3.14.0" }, @@ -4240,7 +4240,7 @@ wheels = [ [[package]] name = "mozci" -version = "2.6.0" +version = "2.6.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "appdirs" }, @@ -4260,9 +4260,9 @@ dependencies = [ { name = "validx" }, { name = "zstandard" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f8/07/2eb0ccfff9853a0f88031c34729bca9fba4851d5bdc88018cfb016c32413/mozci-2.6.0.tar.gz", hash = "sha256:1c8146a51b839c71a3afc98141dc1230b8389988a8a3305b42e0a4a4a1a9b1eb", size = 77979, upload-time = "2026-11-12T13:25:05.405Z" } +sdist = { url = "https://files.pythonhosted.org/packages/59/42/62f56cc6ff579273dec15b0221aa530f3f07b4f889232f1a64cf5a743060/mozci-2.6.1.tar.gz", hash = "sha256:6ce3a8943da95d52d0676ca5227ccc9e7e93b702e02925f8b0de24683c3cc572", size = 77978, upload-time = "2026-11-17T23:11:25.427Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/53/8d/ba54e2499a2cf888d6afe532aa2bbbfc901a842e3ec0c748988b2cb484d3/mozci-2.6.0-py3-none-any.whl", hash = "sha256:c62097c8e0bf98c5655031f10bc123dfc0a00a60e0790faebfa3f3e4a8dfcf0b", size = 92183, upload-time = "2026-11-12T13:25:06.999Z" }, + { url = "https://files.pythonhosted.org/packages/07/d8/c8b5b1bf06fc347517b2cd712a5017a57f9605053eedaa0f9b6fadcd2299/mozci-2.6.1-py3-none-any.whl", hash = "sha256:b52a902f212c2b1e5dd340d4fd219d47c484ec0fb037a8ba49753e75af6eef5b", size = 92184, upload-time = "2026-11-17T23:11:27.021Z" }, ] [[package]] From d26edd8788bc73896b5447079501dc228dfe6f28 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 19 Nov 2026 23:50:02 +0100 Subject: [PATCH 2/2] Use mozci's get_configuration in the shadow scheduler statistics Since mozci 2.6.1, get_configuration reads the test variants of tasks from their "test-setting", so the statistics don't need their own workaround anymore. --- scripts/shadow_scheduler_stats.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/scripts/shadow_scheduler_stats.py b/scripts/shadow_scheduler_stats.py index f3a1165f43..ac2557fdfb 100644 --- a/scripts/shadow_scheduler_stats.py +++ b/scripts/shadow_scheduler_stats.py @@ -16,7 +16,7 @@ import mozci.errors import mozci.push from dateutil.relativedelta import relativedelta -from mozci.task import get_configuration as mozci_get_configuration +from mozci.task import get_configuration from pandas import DataFrame, DatetimeIndex, Series from tqdm import tqdm @@ -47,21 +47,6 @@ ) -def get_configuration(task: dict) -> str: - # mozci reads the test variants from "test-settings", but the task graph - # calls it "test-setting", so variants (e.g. "-swr") would be lost. - extra = task["task"]["extra"] - if "test-setting" in extra and "test-settings" not in extra: - task = { - **task, - "task": { - **task["task"], - "extra": {**extra, "test-settings": extra["test-setting"]}, - }, - } - return mozci_get_configuration(task) - - # Granularities at which tasks, rather than groups, are evaluated: # - "non_group": test tasks which don't run test groups (e.g. gtest); # - "build": builds.