Merge pull request #411 from faster-cpython/dont-have-toplevel-weekly-array

Dont have toplevel weekly array

Author: mdboom

CHANGELOG.md

@@ -74,8 +74,6 @@ specifying the runners to run on.
 For example:
 
 ```toml
-[[weekly]]
-
 [weekly.default]
 flags = []
 runners = ["linux", "darwin", "windows"]
@@ -84,3 +82,15 @@ runners = ["linux", "darwin", "windows"]
 flags = ["TAILCALL"]
 runners = ["linux_clang", "darwin", "windows_clang"]
 ```
+
+## v1.8.0
+
+### bench_runner.toml change
+
+The configuration no longer expects a top-level, single element `runners` array.
+
+You should remove the following line from your `bench_runners.toml`:
+
+```toml
+[[runners]]
+```

bench_runner/runners.py

@@ -48,7 +48,7 @@ def display_name(self) -> str:
 
 @functools.cache
 def get_runners() -> list[Runner]:
-    conf = config.get_bench_runner_config().get("runners", [{}])[0]
+    conf = config.get_bench_runner_config().get("runners", {})
     runners = []
     for nickname, section in conf.items():
         runners.append(

bench_runner/scripts/install.py

@@ -229,10 +229,9 @@ def generate__notify(dst: Any) -> Any:
 def generate__weekly(dst: Any) -> Any:
     cfg = config.get_bench_runner_config()
 
-    weekly = cfg.get("weekly", {})
+    weekly = cfg.get("weekly", None)
     if not weekly:
-        weekly = [{"default": {"flags": [], "runners": cfg.get("runners", {}).keys()}}]
-    weekly = weekly[0]
+        weekly = {"default": {"flags": [], "runners": cfg.get("runners", {}).keys()}}
 
     all_jobs = []
 

bench_runner/templates/bench_runner.toml

@@ -42,7 +42,6 @@ notification_issue = 182
 #   --enable-optimizations and --with-lto=full.
 # BUILD_DEST: (windows only) where to make build.bat install. This is
 #   required for the Windows build to succeed.
-[[runners]]
 
 [runners.linux]
 os = "linux"

tests/data/bench_runner.toml

@@ -2,7 +2,6 @@
 versions = ["base2", "base4"]
 compare_to_default = ["NOGIL"]
 
-[[runners]]
 [runners.linux]
 os = "linux"
 arch = "x86_64"