Skip to content

Commit c4aefdc

Browse files
SimonHeybrockSimonHeybrock
authored
Merge pull request #160 from scipp/use-generic-tof-wf
Use generic tof workflow
2 parents 02788cc + 8b1ec10 commit c4aefdc

File tree

21 files changed

+150
-273
lines changed

21 files changed

+150
-273
lines changed

‎docs/user-guide/sns-instruments/POWGEN_data_reduction.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
"source": [
240240
"results = workflow.compute(\n",
241241
" (\n",
242-
" TofData[SampleRun],\n",
242+
" DetectorTofData[SampleRun],\n",
243243
" MaskedData[SampleRun],\n",
244244
" FilteredData[SampleRun],\n",
245245
" FilteredData[VanadiumRun],\n",
@@ -254,7 +254,7 @@
254254
"metadata": {},
255255
"outputs": [],
256256
"source": [
257-
"results[TofData[SampleRun]]"
257+
"results[DetectorTofData[SampleRun]]"
258258
]
259259
},
260260
{

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ requires-python = ">=3.10"
3232
# Make sure to list one dependency per line.
3333
dependencies = [
3434
"dask",
35-
"essreduce>=25.02.4",
35+
"essreduce>=25.05.1",
3636
"graphviz",
3737
"numpy",
3838
"plopp>=25.03.0",

‎requirements/base.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# --- END OF CUSTOM SECTION ---
44
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
55
dask
6-
essreduce>=25.02.4
6+
essreduce>=25.05.1
77
graphviz
88
numpy
99
plopp>=25.03.0

‎requirements/base.txt‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:4c637dd9c91e42089ff8f729de2279bb8611bf83
1+
# SHA1:9fd92aa14a70d874a87640e7dbb332600b0c2ac7
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -9,33 +9,33 @@ annotated-types==0.7.0
99
# via pydantic
1010
asttokens==3.0.0
1111
# via stack-data
12-
click==8.1.8
12+
click==8.2.0
1313
# via dask
1414
cloudpickle==3.1.1
1515
# via dask
1616
comm==0.2.2
1717
# via ipywidgets
18-
contourpy==1.3.1
18+
contourpy==1.3.2
1919
# via matplotlib
2020
cyclebane==24.10.0
2121
# via sciline
2222
cycler==0.12.1
2323
# via matplotlib
24-
dask==2025.3.0
24+
dask==2025.5.0
2525
# via -r base.in
2626
decorator==5.2.1
2727
# via ipython
2828
dnspython==2.7.0
2929
# via email-validator
3030
email-validator==2.2.0
3131
# via scippneutron
32-
essreduce==25.4.1
32+
essreduce==25.5.1
3333
# via -r base.in
34-
exceptiongroup==1.2.2
34+
exceptiongroup==1.3.0
3535
# via ipython
3636
executing==2.2.0
3737
# via stack-data
38-
fonttools==4.57.0
38+
fonttools==4.58.0
3939
# via matplotlib
4040
fsspec==2025.3.2
4141
# via dask
@@ -47,53 +47,51 @@ h5py==3.13.0
4747
# scippnexus
4848
idna==3.10
4949
# via email-validator
50-
importlib-metadata==8.6.1
50+
importlib-metadata==8.7.0
5151
# via dask
52-
importlib-resources==6.5.2
53-
# via tof
5452
ipydatawidgets==4.3.5
5553
# via pythreejs
56-
ipython==8.35.0
54+
ipython==8.36.0
5755
# via ipywidgets
58-
ipywidgets==8.1.5
56+
ipywidgets==8.1.7
5957
# via
6058
# ipydatawidgets
6159
# pythreejs
6260
jedi==0.19.2
6361
# via ipython
64-
jupyterlab-widgets==3.0.13
62+
jupyterlab-widgets==3.0.15
6563
# via ipywidgets
6664
kiwisolver==1.4.8
6765
# via matplotlib
6866
lazy-loader==0.4
6967
# via
7068
# plopp
7169
# scippneutron
70+
# tof
7271
locket==1.0.0
7372
# via partd
74-
matplotlib==3.10.1
73+
matplotlib==3.10.3
7574
# via
7675
# mpltoolbox
7776
# plopp
7877
matplotlib-inline==0.1.7
7978
# via ipython
80-
mpltoolbox==24.5.1
79+
mpltoolbox==25.4.0
8180
# via scippneutron
8281
networkx==3.4.2
8382
# via cyclebane
84-
numpy==2.2.4
83+
numpy==2.2.5
8584
# via
8685
# -r base.in
8786
# contourpy
8887
# h5py
8988
# ipydatawidgets
9089
# matplotlib
91-
# mpltoolbox
9290
# pythreejs
9391
# scipp
9492
# scippneutron
9593
# scipy
96-
packaging==24.2
94+
packaging==25.0
9795
# via
9896
# dask
9997
# lazy-loader
@@ -104,22 +102,22 @@ partd==1.4.2
104102
# via dask
105103
pexpect==4.9.0
106104
# via ipython
107-
pillow==11.1.0
105+
pillow==11.2.1
108106
# via matplotlib
109-
plopp==25.3.0
107+
plopp==25.4.1
110108
# via
111109
# -r base.in
112110
# scippneutron
113111
# tof
114-
prompt-toolkit==3.0.50
112+
prompt-toolkit==3.0.51
115113
# via ipython
116114
ptyprocess==0.7.0
117115
# via pexpect
118116
pure-eval==0.2.3
119117
# via stack-data
120-
pydantic==2.11.3
118+
pydantic==2.11.4
121119
# via scippneutron
122-
pydantic-core==2.33.1
120+
pydantic-core==2.33.2
123121
# via pydantic
124122
pygments==2.19.1
125123
# via ipython
@@ -134,7 +132,7 @@ pythreejs==2.4.2
134132
# via -r base.in
135133
pyyaml==6.0.2
136134
# via dask
137-
sciline==25.4.1
135+
sciline==25.5.0
138136
# via
139137
# -r base.in
140138
# essreduce
@@ -145,7 +143,7 @@ scipp==25.5.0
145143
# scippneutron
146144
# scippnexus
147145
# tof
148-
scippneutron==25.2.1
146+
scippneutron==25.5.0
149147
# via
150148
# -r base.in
151149
# essreduce
@@ -154,7 +152,7 @@ scippnexus==25.4.0
154152
# -r base.in
155153
# essreduce
156154
# scippneutron
157-
scipy==1.15.2
155+
scipy==1.15.3
158156
# via
159157
# scippneutron
160158
# scippnexus
@@ -163,7 +161,7 @@ six==1.17.0
163161
# via python-dateutil
164162
stack-data==0.6.3
165163
# via ipython
166-
tof==25.4.0
164+
tof==25.5.0
167165
# via -r base.in
168166
toolz==1.0.0
169167
# via
@@ -179,8 +177,9 @@ traitlets==5.14.3
179177
# traittypes
180178
traittypes==0.2.1
181179
# via ipydatawidgets
182-
typing-extensions==4.13.1
180+
typing-extensions==4.13.2
183181
# via
182+
# exceptiongroup
184183
# ipython
185184
# pydantic
186185
# pydantic-core
@@ -190,7 +189,7 @@ typing-inspection==0.4.0
190189
# via pydantic
191190
wcwidth==0.2.13
192191
# via prompt-toolkit
193-
widgetsnbextension==4.0.13
192+
widgetsnbextension==4.0.14
194193
# via ipywidgets
195194
zipp==3.21.0
196195
# via importlib-metadata

‎requirements/basetest.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55
#
66
# pip-compile-multi
77
#
8-
certifi==2025.1.31
8+
certifi==2025.4.26
99
# via requests
10-
charset-normalizer==3.4.1
10+
charset-normalizer==3.4.2
1111
# via requests
12-
exceptiongroup==1.2.2
12+
exceptiongroup==1.3.0
1313
# via pytest
1414
idna==3.10
1515
# via requests
1616
iniconfig==2.1.0
1717
# via pytest
18-
numpy==2.2.4
18+
numpy==2.2.5
1919
# via pandas
20-
packaging==24.2
20+
packaging==25.0
2121
# via
2222
# pooch
2323
# pytest
2424
pandas==2.2.3
2525
# via -r basetest.in
26-
platformdirs==4.3.7
26+
platformdirs==4.3.8
2727
# via pooch
2828
pluggy==1.5.0
2929
# via pytest
@@ -41,7 +41,9 @@ six==1.17.0
4141
# via python-dateutil
4242
tomli==2.2.1
4343
# via pytest
44+
typing-extensions==4.13.2
45+
# via exceptiongroup
4446
tzdata==2025.2
4547
# via pandas
46-
urllib3==2.3.0
48+
urllib3==2.4.0
4749
# via requests

‎requirements/ci.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#
88
cachetools==5.5.2
99
# via tox
10-
certifi==2025.1.31
10+
certifi==2025.4.26
1111
# via requests
1212
chardet==5.2.0
1313
# via tox
14-
charset-normalizer==3.4.1
14+
charset-normalizer==3.4.2
1515
# via requests
1616
colorama==0.4.6
1717
# via tox
@@ -27,18 +27,18 @@ gitpython==3.1.44
2727
# via -r ci.in
2828
idna==3.10
2929
# via requests
30-
packaging==24.2
30+
packaging==25.0
3131
# via
3232
# -r ci.in
3333
# pyproject-api
3434
# tox
35-
platformdirs==4.3.7
35+
platformdirs==4.3.8
3636
# via
3737
# tox
3838
# virtualenv
3939
pluggy==1.5.0
4040
# via tox
41-
pyproject-api==1.9.0
41+
pyproject-api==1.9.1
4242
# via tox
4343
requests==2.32.3
4444
# via -r ci.in
@@ -48,11 +48,11 @@ tomli==2.2.1
4848
# via
4949
# pyproject-api
5050
# tox
51-
tox==4.25.0
51+
tox==4.26.0
5252
# via -r ci.in
53-
typing-extensions==4.13.1
53+
typing-extensions==4.13.2
5454
# via tox
55-
urllib3==2.3.0
55+
urllib3==2.4.0
5656
# via requests
57-
virtualenv==20.30.0
57+
virtualenv==20.31.2
5858
# via tox

‎requirements/dev.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ async-lru==2.0.5
2626
# via jupyterlab
2727
cffi==1.17.1
2828
# via argon2-cffi-bindings
29-
copier==9.6.0
29+
copier==9.7.1
3030
# via -r dev.in
31-
dunamai==1.23.1
31+
dunamai==1.24.1
3232
# via copier
3333
fqdn==1.5.1
3434
# via jsonschema
3535
funcy==2.0
3636
# via copier
37-
h11==0.14.0
37+
h11==0.16.0
3838
# via httpcore
39-
httpcore==1.0.7
39+
httpcore==1.0.9
4040
# via httpx
4141
httpx==0.28.1
4242
# via jupyterlab
@@ -57,15 +57,15 @@ jupyter-events==0.12.0
5757
# via jupyter-server
5858
jupyter-lsp==2.2.5
5959
# via jupyterlab
60-
jupyter-server==2.15.0
60+
jupyter-server==2.16.0
6161
# via
6262
# jupyter-lsp
6363
# jupyterlab
6464
# jupyterlab-server
6565
# notebook-shim
6666
jupyter-server-terminals==0.5.3
6767
# via jupyter-server
68-
jupyterlab==4.4.0
68+
jupyterlab==4.4.2
6969
# via -r dev.in
7070
jupyterlab-server==2.27.3
7171
# via jupyterlab
@@ -75,7 +75,7 @@ overrides==7.7.0
7575
# via jupyter-server
7676
pathspec==0.12.1
7777
# via copier
78-
pip-compile-multi==2.8.0
78+
pip-compile-multi==3.0.0
7979
# via -r dev.in
8080
pip-tools==7.4.1
8181
# via pip-compile-multi

0 commit comments

Comments
 (0)