Merge pull request #240 from scipp/custom-typevar-constraints

Constrain type vars instead of pruning

Author: jl-wynen

docs/user-guide/tof/dream.ipynb

@@ -306,7 +306,9 @@
    "outputs": [],
    "source": [
     "wf = time_of_flight.GenericTofWorkflow(\n",
-    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF\n",
+    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF,\n",
+    "    run_types=[SampleRun],\n",
+    "    monitor_types=[],\n",
     ")\n",
     "wf[DetectorData[SampleRun]] = raw_data\n",
     "wf[time_of_flight.DetectorLtotal[SampleRun]] = Ltotal\n",

docs/user-guide/tof/frame-unwrapping.ipynb

@@ -160,7 +160,9 @@
    "outputs": [],
    "source": [
     "wf = time_of_flight.GenericTofWorkflow(\n",
-    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF\n",
+    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF,\n",
+    "    run_types=[SampleRun],\n",
+    "    monitor_types=[],\n",
     ")\n",
     "\n",
     "wf[DetectorData[SampleRun]] = nxevent_data\n",
@@ -371,7 +373,9 @@
    "outputs": [],
    "source": [
     "wf = time_of_flight.GenericTofWorkflow(\n",
-    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF\n",
+    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF,\n",
+    "    run_types=[SampleRun],\n",
+    "    monitor_types=[],\n",
     ")\n",
     "\n",
     "nxevent_data = results.to_nxevent_data()\n",

docs/user-guide/tof/wfm.ipynb

@@ -327,7 +327,9 @@
    "outputs": [],
    "source": [
     "wf = time_of_flight.GenericTofWorkflow(\n",
-    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF\n",
+    "    tof_lut_provider=time_of_flight.TofLutProvider.TOF,\n",
+    "    run_types=[SampleRun],\n",
+    "    monitor_types=[],\n",
     ")\n",
     "wf[DetectorData[SampleRun]] = raw_data\n",
     "wf[time_of_flight.DetectorLtotal[SampleRun]] = Ltotal\n",

pyproject.toml

@@ -31,7 +31,7 @@ requires-python = ">=3.10"
 # Run 'tox -e deps' after making changes here. This will update requirement files.
 # Make sure to list one dependency per line.
 dependencies = [
-    "sciline>=25.04.1",
+    "sciline>=25.05.1",
     "scipp>=25.01.0",
     "scippneutron>=25.02.0",
     "scippnexus>=24.11.0",

requirements/base.in

@@ -2,7 +2,7 @@
 # will not be touched by ``make_base.py``
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
-sciline>=25.04.1
+sciline>=25.05.1
 scipp>=25.01.0
 scippneutron>=25.02.0
 scippnexus>=24.11.0

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:082d6bf55d8a06cdc1dd3a0a78dd31c318c26424
+# SHA1:da1d0d3975da182dcdb34676612971ba09dbdc53
 #
 # This file was generated by pip-compile-multi.
 # To update, run:
@@ -17,7 +17,7 @@ dnspython==2.7.0
     # via email-validator
 email-validator==2.2.0
     # via scippneutron
-fonttools==4.57.0
+fonttools==4.58.0
     # via matplotlib
 h5py==3.13.0
     # via
@@ -31,7 +31,7 @@ lazy-loader==0.4
     # via
     #   plopp
     #   scippneutron
-matplotlib==3.10.1
+matplotlib==3.10.3
     # via
     #   mpltoolbox
     #   plopp
@@ -66,20 +66,20 @@ python-dateutil==2.9.0.post0
     #   matplotlib
     #   scippneutron
     #   scippnexus
-sciline==25.4.1
+sciline==25.5.1
     # via -r base.in
 scipp==25.5.0
     # via
     #   -r base.in
     #   scippneutron
     #   scippnexus
-scippneutron==25.2.1
+scippneutron==25.5.0
     # via -r base.in
 scippnexus==25.4.0
     # via
     #   -r base.in
     #   scippneutron
-scipy==1.15.2
+scipy==1.15.3
     # via
     #   scippneutron
     #   scippnexus

requirements/basetest.txt

@@ -19,25 +19,25 @@ cycler==0.12.1
     # via matplotlib
 decorator==5.2.1
     # via ipython
-exceptiongroup==1.2.2
+exceptiongroup==1.3.0
     # via
     #   ipython
     #   pytest
 executing==2.2.0
     # via stack-data
-fonttools==4.57.0
+fonttools==4.58.0
     # via matplotlib
 idna==3.10
     # via requests
 iniconfig==2.1.0
     # via pytest
 ipython==8.36.0
     # via ipywidgets
-ipywidgets==8.1.6
+ipywidgets==8.1.7
     # via -r basetest.in
 jedi==0.19.2
     # via ipython
-jupyterlab-widgets==3.0.14
+jupyterlab-widgets==3.0.15
     # via ipywidgets
 kiwisolver==1.4.8
     # via matplotlib
@@ -47,7 +47,7 @@ lazy-loader==0.4
     #   tof
 llvmlite==0.44.0
     # via numba
-matplotlib==3.10.1
+matplotlib==3.10.3
     # via plopp
 matplotlib-inline==0.1.7
     # via ipython
@@ -72,7 +72,7 @@ pexpect==4.9.0
     # via ipython
 pillow==11.2.1
     # via matplotlib
-platformdirs==4.3.7
+platformdirs==4.3.8
     # via pooch
 plopp==25.4.1
     # via tof
@@ -98,7 +98,7 @@ requests==2.32.3
     # via pooch
 scipp==25.5.0
     # via tof
-scipy==1.15.2
+scipy==1.15.3
     # via
     #   -r basetest.in
     #   tof
@@ -117,7 +117,9 @@ traitlets==5.14.3
     #   ipywidgets
     #   matplotlib-inline
 typing-extensions==4.13.2
-    # via ipython
+    # via
+    #   exceptiongroup
+    #   ipython
 urllib3==2.4.0
     # via requests
 wcwidth==0.2.13

requirements/ci.txt

@@ -32,13 +32,13 @@ packaging==25.0
     #   -r ci.in
     #   pyproject-api
     #   tox
-platformdirs==4.3.7
+platformdirs==4.3.8
     # via
     #   tox
     #   virtualenv
 pluggy==1.5.0
     # via tox
-pyproject-api==1.9.0
+pyproject-api==1.9.1
     # via tox
 requests==2.32.3
     # via -r ci.in
@@ -48,11 +48,11 @@ tomli==2.2.1
     # via
     #   pyproject-api
     #   tox
-tox==4.25.0
+tox==4.26.0
     # via -r ci.in
 typing-extensions==4.13.2
     # via tox
 urllib3==2.4.0
     # via requests
-virtualenv==20.30.0
+virtualenv==20.31.2
     # via tox

requirements/dev.txt

@@ -26,13 +26,13 @@ async-lru==2.0.5
     # via jupyterlab
 cffi==1.17.1
     # via argon2-cffi-bindings
-click==8.1.8
+click==8.2.0
     # via
     #   pip-compile-multi
     #   pip-tools
 copier==9.7.1
     # via -r dev.in
-dunamai==1.23.1
+dunamai==1.24.1
     # via copier
 fqdn==1.5.1
     # via jsonschema
@@ -61,15 +61,15 @@ jupyter-events==0.12.0
     # via jupyter-server
 jupyter-lsp==2.2.5
     # via jupyterlab
-jupyter-server==2.15.0
+jupyter-server==2.16.0
     # via
     #   jupyter-lsp
     #   jupyterlab
     #   jupyterlab-server
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.4.1
+jupyterlab==4.4.2
     # via -r dev.in
 jupyterlab-server==2.27.3
     # via jupyterlab

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
 asttokens==3.0.0
     # via stack-data
 attrs==25.3.0
@@ -48,7 +46,7 @@ docutils==0.21.2
     #   nbsphinx
     #   pydata-sphinx-theme
     #   sphinx
-exceptiongroup==1.2.2
+exceptiongroup==1.3.0
     # via ipython
 executing==2.2.0
     # via stack-data
@@ -65,7 +63,7 @@ ipython==8.36.0
     #   -r docs.in
     #   ipykernel
     #   ipywidgets
-ipywidgets==8.1.6
+ipywidgets==8.1.7
     # via -r docs.in
 jedi==0.19.2
     # via ipython
@@ -92,7 +90,7 @@ jupyter-core==5.7.2
     #   nbformat
 jupyterlab-pygments==0.3.0
     # via nbconvert
-jupyterlab-widgets==3.0.14
+jupyterlab-widgets==3.0.15
     # via ipywidgets
 markdown-it-py==3.0.0
     # via
@@ -133,7 +131,7 @@ parso==0.8.4
     # via jedi
 pexpect==4.9.0
     # via ipython
-platformdirs==4.3.7
+platformdirs==4.3.8
     # via jupyter-core
 prompt-toolkit==3.0.51
     # via ipython
@@ -168,7 +166,7 @@ rpds-py==0.24.0
     # via
     #   jsonschema
     #   referencing
-snowballstemmer==2.2.0
+snowballstemmer==3.0.1
     # via sphinx
 soupsieve==2.7
     # via beautifulsoup4