From 048ca629a899bc61057484a99bc77017e09c7446 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Wynen <jan-lukas.wynen@ess.eu>
Date: Thu, 10 Apr 2025 13:42:16 +0200
Subject: [PATCH 1/2] Require sciline>=25.4.1

Needed for variadic Scope
---
 pyproject.toml        | 2 +-
 requirements/base.in  | 4 ++--
 requirements/base.txt | 4 ++--
 requirements/docs.txt | 2 --
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2d7530bf..e0378455 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,7 @@ dependencies = [
   "numpy",
   "plopp>=25.03.0",
   "pythreejs",
-  "sciline>=24.06.0",
+  "sciline>=25.04.1",
   "scipp>=24.09.1",
   "scippneutron>=25.02.0",
   "scippnexus>=23.12.0",
diff --git a/requirements/base.in b/requirements/base.in
index b9d1a5c5..79492d7a 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -3,12 +3,12 @@
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
-essreduce>=25.04.0
+essreduce>=25.02.4
 graphviz
 numpy
 plopp>=25.03.0
 pythreejs
-sciline>=24.06.0
+sciline>=25.04.1
 scipp>=24.09.1
 scippneutron>=25.02.0
 scippnexus>=23.12.0
diff --git a/requirements/base.txt b/requirements/base.txt
index 82eeb534..d3b771f3 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:b690e6a12ac4cde710521c39719a0c2f61f44602
+# SHA1:4c637dd9c91e42089ff8f729de2279bb8611bf83
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -29,7 +29,7 @@ dnspython==2.7.0
     # via email-validator
 email-validator==2.2.0
     # via scippneutron
-essreduce==25.4.0
+essreduce==25.4.1
     # via -r base.in
 exceptiongroup==1.2.2
     # via ipython
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 031bc334..d1ca2dbd 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -10,8 +10,6 @@ accessible-pygments==0.0.5
     # via pydata-sphinx-theme
 alabaster==1.0.0
     # via sphinx
-appnope==0.1.4
-    # via ipykernel
 attrs==25.3.0
     # via
     #   jsonschema

From 32d9b6bbb8754e67a7224c4a00132b364df7d6ec Mon Sep 17 00:00:00 2001
From: Jan-Lukas Wynen <jan-lukas.wynen@ess.eu>
Date: Thu, 10 Apr 2025 13:42:44 +0200
Subject: [PATCH 2/2] Use variadic Scope

---
 src/ess/powder/types.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/ess/powder/types.py b/src/ess/powder/types.py
index fd2cfe77..c8c1cb9e 100644
--- a/src/ess/powder/types.py
+++ b/src/ess/powder/types.py
@@ -164,7 +164,7 @@ class MonitorFilename(sciline.Scope[RunType, Path], Path):
 
 
 class WavelengthMonitor(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
+    sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray
 ):
     """Monitor histogram in wavelength."""
 
@@ -216,15 +216,11 @@ class DetectorLtotal(sciline.Scope[RunType, sc.Variable], sc.Variable):
     """Total path length of neutrons from source to detector (L1 + L2)."""
 
 
-class MonitorLtotal(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.Variable], sc.Variable
-):
+class MonitorLtotal(sciline.Scope[RunType, MonitorType, sc.Variable], sc.Variable):
     """Total path length of neutrons from source to monitor."""
 
 
-class TofMonitorData(
-    sciline.ScopeTwoParams[RunType, MonitorType, sc.DataArray], sc.DataArray
-):
+class TofMonitorData(sciline.Scope[RunType, MonitorType, sc.DataArray], sc.DataArray):
     """Monitor data with time-of-flight coordinate."""