Merge branch 'master' into build/use-hatchling

.pre-commit-config.yaml

@@ -4,14 +4,8 @@ repos:
     hooks:
     -   id: black
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.1
+    rev: v1.11.2
     hooks:
-    -   id: mypy
-        name: mypy with Python 3.9
-        files: src/cabinetry
-        additional_dependencies: ["numpy>=1.22", "boost-histogram>=1.0.1", "click>=8", "types-tabulate", "types-PyYAML", "hist>=2.3.0"]
-        # numpy 1.25 is no longer compatible with Python 3.8, so use Python >=3.9 for type checking
-        args: ["--python-version=3.9"]
     -   id: mypy
         name: mypy with Python 3.12
         files: src/cabinetry

src/cabinetry/schemas/config.json

@@ -422,5 +422,5 @@
             "additionalProperties": false
         }
     },
-    "additionalProperties": false
+    "additionalProperties": true
 }

tests/test_configuration.py

@@ -23,12 +23,13 @@ def test_validate():
     }
     assert configuration.validate(config_valid)
 
-    # not exactly one data sample
+    # not exactly one data sample, custom additional top-level properties
     config_multiple_data_samples = {
         "General": {"Measurement": "", "HistogramFolder": "", "InputPath": ""},
         "Regions": [{"Name": "", "Filter": "", "Variable": "", "Binning": [0, 1]}],
         "Samples": [{"Name": "", "Tree": ""}],
         "NormFactors": [{"Name": ""}],
+        "ABC": [],
     }
     with pytest.raises(
         NotImplementedError, match="can only handle cases with exactly one data sample"