Skip to content

Commit 5f61789

Browse files
authored
Merge pull request #179 from scipp/common-data-registry
Use data registry from essreduce
2 parents 0d9ce1c + 96934f5 commit 5f61789

File tree

16 files changed

+280
-298
lines changed

16 files changed

+280
-298
lines changed

docs/user-guide/offspec/offspec_reduction.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@
120120
" polarization=\"unpolarized\",\n",
121121
" ),\n",
122122
" data_files=[\n",
123-
" offspec.data.offspec_sample_run().rsplit(\"/\", 1)[-1],\n",
124-
" offspec.data.offspec_direct_beam_run().rsplit(\"/\", 1)[-1],\n",
123+
" wf.compute(Filename[SampleRun]).name,\n",
124+
" wf.compute(Filename[ReferenceRun]).name,\n",
125125
" ],\n",
126126
" scheme=\"energy-dispersive\",\n",
127127
")"
@@ -439,7 +439,7 @@
439439
"name": "python",
440440
"nbconvert_exporter": "python",
441441
"pygments_lexer": "ipython3",
442-
"version": "3.10.14"
442+
"version": "3.11.10"
443443
}
444444
},
445445
"nbformat": 4,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies = [
3939
"scipp>=24.09.1", # Fixed new hist/bin API
4040
"scippneutron>=24.10.0",
4141
"scippnexus>=24.9.1",
42-
"essreduce>=25.4.0",
42+
"essreduce>=25.10.0",
4343
"pandas>=2.1.2",
4444
]
4545

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ sciline>=24.6.0
1111
scipp>=24.09.1
1212
scippneutron>=24.10.0
1313
scippnexus>=24.9.1
14-
essreduce>=25.4.0
14+
essreduce>=25.10.0
1515
pandas>=2.1.2

requirements/base.txt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:130d28f27af16c0c6e122d19bb76f37750334d26
1+
# SHA1:ea4eb0862041433c90c4b8ac1b1cf7f7cd7f70eb
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -7,7 +7,7 @@
77
#
88
annotated-types==0.7.0
99
# via pydantic
10-
click==8.2.1
10+
click==8.3.0
1111
# via dask
1212
cloudpickle==3.1.1
1313
# via dask
@@ -17,45 +17,45 @@ cyclebane==24.10.0
1717
# via sciline
1818
cycler==0.12.1
1919
# via matplotlib
20-
dask==2025.7.0
20+
dask==2025.9.1
2121
# via -r base.in
22-
dnspython==2.7.0
22+
dnspython==2.8.0
2323
# via email-validator
24-
email-validator==2.2.0
24+
email-validator==2.3.0
2525
# via scippneutron
26-
essreduce==25.7.1
26+
essreduce==25.10.0
2727
# via -r base.in
28-
fonttools==4.59.0
28+
fonttools==4.60.1
2929
# via matplotlib
30-
fsspec==2025.7.0
30+
fsspec==2025.9.0
3131
# via dask
3232
graphviz==0.21
3333
# via -r base.in
34-
h5py==3.14.0
34+
h5py==3.15.0
3535
# via
3636
# scippneutron
3737
# scippnexus
38-
idna==3.10
38+
idna==3.11
3939
# via email-validator
4040
importlib-metadata==8.7.0
4141
# via dask
42-
kiwisolver==1.4.8
42+
kiwisolver==1.4.9
4343
# via matplotlib
4444
lazy-loader==0.4
4545
# via
4646
# plopp
4747
# scippneutron
4848
locket==1.0.0
4949
# via partd
50-
matplotlib==3.10.5
50+
matplotlib==3.10.7
5151
# via
5252
# mpltoolbox
5353
# plopp
54-
mpltoolbox==25.5.0
54+
mpltoolbox==25.10.0
5555
# via scippneutron
5656
networkx==3.5
5757
# via cyclebane
58-
numpy==2.3.2
58+
numpy==2.3.3
5959
# via
6060
# contourpy
6161
# h5py
@@ -71,21 +71,21 @@ packaging==25.0
7171
# dask
7272
# lazy-loader
7373
# matplotlib
74-
pandas==2.3.1
74+
pandas==2.3.3
7575
# via -r base.in
7676
partd==1.4.2
7777
# via dask
7878
pillow==11.3.0
7979
# via matplotlib
80-
plopp==25.7.1
80+
plopp==25.10.0
8181
# via
8282
# -r base.in
8383
# scippneutron
84-
pydantic==2.11.7
84+
pydantic==2.12.0
8585
# via scippneutron
86-
pydantic-core==2.33.2
86+
pydantic-core==2.41.1
8787
# via pydantic
88-
pyparsing==3.2.3
88+
pyparsing==3.2.5
8989
# via matplotlib
9090
python-dateutil==2.9.0.post0
9191
# via
@@ -96,15 +96,15 @@ python-dateutil==2.9.0.post0
9696
# scippnexus
9797
pytz==2025.2
9898
# via pandas
99-
pyyaml==6.0.2
99+
pyyaml==6.0.3
100100
# via
101101
# dask
102102
# orsopy
103-
sciline==25.5.2
103+
sciline==25.8.0
104104
# via
105105
# -r base.in
106106
# essreduce
107-
scipp==25.5.1
107+
scipp==25.8.0
108108
# via
109109
# -r base.in
110110
# essreduce
@@ -119,7 +119,7 @@ scippnexus==25.6.0
119119
# -r base.in
120120
# essreduce
121121
# scippneutron
122-
scipy==1.16.1
122+
scipy==1.16.2
123123
# via
124124
# scippneutron
125125
# scippnexus
@@ -129,13 +129,13 @@ toolz==1.0.0
129129
# via
130130
# dask
131131
# partd
132-
typing-extensions==4.14.1
132+
typing-extensions==4.15.0
133133
# via
134134
# pydantic
135135
# pydantic-core
136136
# sciline
137137
# typing-inspection
138-
typing-inspection==0.4.1
138+
typing-inspection==0.4.2
139139
# via pydantic
140140
tzdata==2025.2
141141
# via pandas

requirements/basetest.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55
#
66
# requirements upgrade
77
#
8-
certifi==2025.8.3
8+
certifi==2025.10.5
99
# via requests
10-
charset-normalizer==3.4.2
10+
charset-normalizer==3.4.3
1111
# via requests
12-
idna==3.10
12+
idna==3.11
1313
# via requests
1414
iniconfig==2.1.0
1515
# via pytest
1616
packaging==25.0
1717
# via
1818
# pooch
1919
# pytest
20-
platformdirs==4.3.8
20+
platformdirs==4.5.0
2121
# via pooch
2222
pluggy==1.6.0
2323
# via pytest
2424
pooch==1.8.2
2525
# via -r basetest.in
2626
pygments==2.19.2
2727
# via pytest
28-
pytest==8.4.1
28+
pytest==8.4.2
2929
# via -r basetest.in
30-
requests==2.32.4
30+
requests==2.32.5
3131
# via pooch
3232
urllib3==2.5.0
3333
# via requests

requirements/ci.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,48 @@
55
#
66
# requirements upgrade
77
#
8-
cachetools==6.1.0
8+
cachetools==6.2.1
99
# via tox
10-
certifi==2025.8.3
10+
certifi==2025.10.5
1111
# via requests
1212
chardet==5.2.0
1313
# via tox
14-
charset-normalizer==3.4.2
14+
charset-normalizer==3.4.3
1515
# via requests
1616
colorama==0.4.6
1717
# via tox
1818
distlib==0.4.0
1919
# via virtualenv
20-
filelock==3.18.0
20+
filelock==3.20.0
2121
# via
2222
# tox
2323
# virtualenv
2424
gitdb==4.0.12
2525
# via gitpython
2626
gitpython==3.1.45
2727
# via -r ci.in
28-
idna==3.10
28+
idna==3.11
2929
# via requests
3030
packaging==25.0
3131
# via
3232
# -r ci.in
3333
# pyproject-api
3434
# tox
35-
platformdirs==4.3.8
35+
platformdirs==4.5.0
3636
# via
3737
# tox
3838
# virtualenv
3939
pluggy==1.6.0
4040
# via tox
41-
pyproject-api==1.9.1
41+
pyproject-api==1.10.0
4242
# via tox
43-
requests==2.32.4
43+
requests==2.32.5
4444
# via -r ci.in
4545
smmap==5.0.2
4646
# via gitdb
47-
tox==4.28.4
47+
tox==4.31.0
4848
# via -r ci.in
4949
urllib3==2.5.0
5050
# via requests
51-
virtualenv==20.33.1
51+
virtualenv==20.35.3
5252
# via tox

requirements/dev.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-r static.txt
1313
-r test.txt
1414
-r wheels.txt
15-
anyio==4.10.0
15+
anyio==4.11.0
1616
# via
1717
# httpx
1818
# jupyter-server
@@ -24,9 +24,9 @@ arrow==1.3.0
2424
# via isoduration
2525
async-lru==2.0.5
2626
# via jupyterlab
27-
cffi==1.17.1
27+
cffi==2.0.0
2828
# via argon2-cffi-bindings
29-
copier==9.9.0
29+
copier==9.10.2
3030
# via -r dev.in
3131
dunamai==1.25.0
3232
# via copier
@@ -44,50 +44,50 @@ isoduration==20.11.0
4444
# via jsonschema
4545
jinja2-ansible-filters==1.3.2
4646
# via copier
47-
json5==0.12.0
47+
json5==0.12.1
4848
# via jupyterlab-server
4949
jsonpointer==3.0.0
5050
# via jsonschema
51-
jsonschema[format-nongpl]==4.25.0
51+
jsonschema[format-nongpl]==4.25.1
5252
# via
5353
# jupyter-events
5454
# jupyterlab-server
5555
# nbformat
5656
jupyter-events==0.12.0
5757
# via jupyter-server
58-
jupyter-lsp==2.2.6
58+
jupyter-lsp==2.3.0
5959
# via jupyterlab
60-
jupyter-server==2.16.0
60+
jupyter-server==2.17.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.5
68+
jupyterlab==4.4.9
6969
# via -r dev.in
7070
jupyterlab-server==2.27.3
7171
# via jupyterlab
72-
lark==1.2.2
72+
lark==1.3.0
7373
# via rfc3987-syntax
7474
notebook-shim==0.2.4
7575
# via jupyterlab
7676
overrides==7.7.0
7777
# via jupyter-server
78-
pip-compile-multi==3.2.1
78+
pip-compile-multi==3.2.2
7979
# via -r dev.in
80-
pip-tools==7.5.0
80+
pip-tools==7.5.1
8181
# via pip-compile-multi
8282
plumbum==1.9.0
8383
# via copier
84-
prometheus-client==0.22.1
84+
prometheus-client==0.23.1
8585
# via jupyter-server
86-
pycparser==2.22
86+
pycparser==2.23
8787
# via cffi
88-
python-json-logger==3.3.0
88+
python-json-logger==4.0.0
8989
# via jupyter-events
90-
questionary==2.1.0
90+
questionary==2.1.1
9191
# via copier
9292
rfc3339-validator==0.1.4
9393
# via
@@ -109,13 +109,13 @@ terminado==0.18.1
109109
# jupyter-server-terminals
110110
toposort==1.10
111111
# via pip-compile-multi
112-
types-python-dateutil==2.9.0.20250708
112+
types-python-dateutil==2.9.0.20251008
113113
# via arrow
114114
uri-template==1.3.0
115115
# via jsonschema
116116
webcolors==24.11.1
117117
# via jsonschema
118-
websocket-client==1.8.0
118+
websocket-client==1.9.0
119119
# via jupyter-server
120120
wheel==0.45.1
121121
# via pip-tools

0 commit comments

Comments
 (0)