Skip to content

Commit 7e5be2b

Browse files
authored
Merge pull request #83 from scipp/update-deps
Update deps
2 parents d3df017 + 7bcfc99 commit 7e5be2b

File tree

10 files changed

+137
-90
lines changed

10 files changed

+137
-90
lines changed

docs/user-guide/zoom.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@
131131
"source": [
132132
"mons = sans_workflow.compute(\n",
133133
" (\n",
134-
" RawMonitor[TransmissionRun[SampleRun], Incident],\n",
135-
" RawMonitor[TransmissionRun[SampleRun], Transmission],\n",
134+
" NeXusComponent[Incident, TransmissionRun[SampleRun]],\n",
135+
" NeXusComponent[Transmission, TransmissionRun[SampleRun]],\n",
136136
" )\n",
137137
")\n",
138138
"mons = sc.DataGroup(\n",
139-
" incident=mons[RawMonitor[TransmissionRun[SampleRun], Incident]],\n",
140-
" transmission=mons[RawMonitor[TransmissionRun[SampleRun], Transmission]],\n",
139+
" incident=mons[NeXusComponent[Incident, TransmissionRun[SampleRun]]]['data'],\n",
140+
" transmission=mons[NeXusComponent[Transmission, TransmissionRun[SampleRun]]]['data'],\n",
141141
")\n",
142142
"display(sc.DataGroup(sc.collapse(mons['incident'], keep='tof')).plot())\n",
143143
"display(sc.DataGroup(sc.collapse(mons['transmission'], keep='tof')).plot())"

requirements/base.txt

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#
66
# pip-compile-multi
77
#
8+
annotated-types==0.7.0
9+
# via pydantic
810
click==8.1.8
911
# via dask
1012
cloudpickle==3.1.1
@@ -15,27 +17,37 @@ cyclebane==24.10.0
1517
# via sciline
1618
cycler==0.12.1
1719
# via matplotlib
18-
dask==2025.1.0
20+
dask==2025.2.0
1921
# via -r base.in
20-
essreduce==25.2.0
22+
dnspython==2.7.0
23+
# via email-validator
24+
email-validator==2.2.0
25+
# via scippneutron
26+
essreduce==25.3.1
2127
# via -r base.in
2228
fonttools==4.56.0
2329
# via matplotlib
24-
fsspec==2025.2.0
30+
fsspec==2025.3.0
2531
# via dask
2632
graphviz==0.20.3
2733
# via -r base.in
28-
h5py==3.12.1
34+
h5py==3.13.0
2935
# via
3036
# scippneutron
3137
# scippnexus
38+
idna==3.10
39+
# via email-validator
3240
importlib-metadata==8.6.1
3341
# via dask
3442
kiwisolver==1.4.8
3543
# via matplotlib
44+
lazy-loader==0.4
45+
# via
46+
# plopp
47+
# scippneutron
3648
locket==1.0.0
3749
# via partd
38-
matplotlib==3.10.0
50+
matplotlib==3.10.1
3951
# via
4052
# mpltoolbox
4153
# plopp
@@ -56,38 +68,44 @@ numpy==1.26.4
5668
packaging==24.2
5769
# via
5870
# dask
71+
# lazy-loader
5972
# matplotlib
6073
partd==1.4.2
6174
# via dask
6275
pillow==11.1.0
6376
# via matplotlib
64-
plopp==24.10.0
77+
plopp==25.3.0
6578
# via scippneutron
79+
pydantic==2.10.6
80+
# via scippneutron
81+
pydantic-core==2.27.2
82+
# via pydantic
6683
pyparsing==3.2.1
6784
# via matplotlib
6885
python-dateutil==2.9.0.post0
6986
# via
7087
# matplotlib
88+
# scippneutron
7189
# scippnexus
7290
pyyaml==6.0.2
7391
# via dask
7492
sciline==24.10.0
7593
# via
7694
# -r base.in
7795
# essreduce
78-
scipp==25.2.0
96+
scipp==25.3.0
7997
# via
8098
# -r base.in
8199
# essreduce
82100
# scippneutron
83101
# scippnexus
84-
scippneutron==25.1.0
102+
scippneutron==25.2.1
85103
# via essreduce
86104
scippnexus==24.11.1
87105
# via
88106
# essreduce
89107
# scippneutron
90-
scipy==1.15.1
108+
scipy==1.15.2
91109
# via
92110
# -r base.in
93111
# scippneutron
@@ -98,5 +116,9 @@ toolz==1.0.0
98116
# via
99117
# dask
100118
# partd
119+
typing-extensions==4.12.2
120+
# via
121+
# pydantic
122+
# pydantic-core
101123
zipp==3.21.0
102124
# via importlib-metadata

requirements/basetest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#
88
exceptiongroup==1.2.2
99
# via pytest
10-
iniconfig==2.0.0
10+
iniconfig==2.1.0
1111
# via pytest
1212
packaging==24.2
1313
# via pytest
1414
pluggy==1.5.0
1515
# via pytest
16-
pytest==8.3.4
16+
pytest==8.3.5
1717
# via -r basetest.in
1818
tomli==2.2.1
1919
# via pytest

requirements/ci.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# pip-compile-multi
77
#
8-
cachetools==5.5.1
8+
cachetools==5.5.2
99
# via tox
1010
certifi==2025.1.31
1111
# via requests
@@ -17,7 +17,7 @@ colorama==0.4.6
1717
# via tox
1818
distlib==0.3.9
1919
# via virtualenv
20-
filelock==3.17.0
20+
filelock==3.18.0
2121
# via
2222
# tox
2323
# virtualenv
@@ -32,7 +32,7 @@ packaging==24.2
3232
# -r ci.in
3333
# pyproject-api
3434
# tox
35-
platformdirs==4.3.6
35+
platformdirs==4.3.7
3636
# via
3737
# tox
3838
# virtualenv
@@ -48,11 +48,11 @@ tomli==2.2.1
4848
# via
4949
# pyproject-api
5050
# tox
51-
tox==4.24.1
51+
tox==4.24.2
5252
# via -r ci.in
5353
typing-extensions==4.12.2
5454
# via tox
5555
urllib3==2.3.0
5656
# via requests
57-
virtualenv==20.29.2
57+
virtualenv==20.29.3
5858
# via tox

requirements/dev.txt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
-r static.txt
1313
-r test.txt
1414
-r wheels.txt
15-
annotated-types==0.7.0
16-
# via pydantic
17-
anyio==4.8.0
15+
anyio==4.9.0
1816
# via
1917
# httpx
2018
# jupyter-server
@@ -24,13 +22,13 @@ argon2-cffi-bindings==21.2.0
2422
# via argon2-cffi
2523
arrow==1.3.0
2624
# via isoduration
27-
async-lru==2.0.4
25+
async-lru==2.0.5
2826
# via jupyterlab
2927
cffi==1.17.1
3028
# via argon2-cffi-bindings
31-
copier==9.4.1
29+
copier==9.6.0
3230
# via -r dev.in
33-
dunamai==1.23.0
31+
dunamai==1.23.1
3432
# via copier
3533
fqdn==1.5.1
3634
# via jsonschema
@@ -67,7 +65,7 @@ jupyter-server==2.15.0
6765
# notebook-shim
6866
jupyter-server-terminals==0.5.3
6967
# via jupyter-server
70-
jupyterlab==4.3.5
68+
jupyterlab==4.3.6
7169
# via -r dev.in
7270
jupyterlab-server==2.27.3
7371
# via jupyterlab
@@ -77,7 +75,7 @@ overrides==7.7.0
7775
# via jupyter-server
7876
pathspec==0.12.1
7977
# via copier
80-
pip-compile-multi==2.7.1
78+
pip-compile-multi==2.8.0
8179
# via -r dev.in
8280
pip-tools==7.4.1
8381
# via pip-compile-multi
@@ -87,11 +85,7 @@ prometheus-client==0.21.1
8785
# via jupyter-server
8886
pycparser==2.22
8987
# via cffi
90-
pydantic==2.10.6
91-
# via copier
92-
pydantic-core==2.27.2
93-
# via pydantic
94-
python-json-logger==3.2.1
88+
python-json-logger==3.3.0
9589
# via jupyter-events
9690
questionary==2.1.0
9791
# via copier

requirements/docs.txt

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ accessible-pygments==0.0.5
1010
# via pydata-sphinx-theme
1111
alabaster==1.0.0
1212
# via sphinx
13-
appnope==0.1.4
14-
# via ipykernel
1513
asttokens==3.0.0
1614
# via stack-data
17-
attrs==25.1.0
15+
attrs==25.3.0
1816
# via
1917
# jsonschema
2018
# referencing
@@ -36,9 +34,9 @@ comm==0.2.2
3634
# via
3735
# ipykernel
3836
# ipywidgets
39-
debugpy==1.8.12
37+
debugpy==1.8.13
4038
# via ipykernel
41-
decorator==5.1.1
39+
decorator==5.2.1
4240
# via ipython
4341
defusedxml==0.7.1
4442
# via nbconvert
@@ -48,23 +46,21 @@ docutils==0.21.2
4846
# nbsphinx
4947
# pydata-sphinx-theme
5048
# sphinx
51-
esssans==24.10.1
49+
esssans==25.2.0
5250
# via -r docs.in
5351
exceptiongroup==1.2.2
5452
# via ipython
5553
executing==2.2.0
5654
# via stack-data
5755
fastjsonschema==2.21.1
5856
# via nbformat
59-
idna==3.10
60-
# via requests
6157
imagesize==1.4.1
6258
# via sphinx
6359
ipydatawidgets==4.3.5
6460
# via pythreejs
6561
ipykernel==6.29.5
6662
# via -r docs.in
67-
ipython==8.32.0
63+
ipython==8.34.0
6864
# via
6965
# -r docs.in
7066
# ipykernel
@@ -75,7 +71,7 @@ ipywidgets==8.1.5
7571
# pythreejs
7672
jedi==0.19.2
7773
# via ipython
78-
jinja2==3.1.5
74+
jinja2==3.1.6
7975
# via
8076
# myst-parser
8177
# nbconvert
@@ -116,7 +112,7 @@ mdit-py-plugins==0.4.2
116112
# via myst-parser
117113
mdurl==0.1.2
118114
# via markdown-it-py
119-
mistune==3.1.1
115+
mistune==3.1.3
120116
# via nbconvert
121117
mpmath==1.3.0
122118
# via sympy
@@ -131,7 +127,7 @@ nbformat==5.10.4
131127
# nbclient
132128
# nbconvert
133129
# nbsphinx
134-
nbsphinx==0.9.6
130+
nbsphinx==0.9.7
135131
# via -r docs.in
136132
nest-asyncio==1.6.0
137133
# via ipykernel
@@ -143,11 +139,11 @@ parso==0.8.4
143139
# via jedi
144140
pexpect==4.9.0
145141
# via ipython
146-
platformdirs==4.3.6
142+
platformdirs==4.3.7
147143
# via jupyter-core
148144
prompt-toolkit==3.0.50
149145
# via ipython
150-
psutil==6.1.1
146+
psutil==7.0.0
151147
# via ipykernel
152148
ptyprocess==0.7.0
153149
# via pexpect
@@ -166,7 +162,7 @@ pythreejs==2.4.2
166162
# via esssans
167163
pytz==2025.1
168164
# via pandas
169-
pyzmq==26.2.1
165+
pyzmq==26.3.0
170166
# via
171167
# ipykernel
172168
# jupyter-client
@@ -176,7 +172,7 @@ referencing==0.36.2
176172
# jsonschema-specifications
177173
requests==2.32.3
178174
# via sphinx
179-
rpds-py==0.22.3
175+
rpds-py==0.23.1
180176
# via
181177
# jsonschema
182178
# referencing
@@ -243,13 +239,6 @@ traitlets==5.14.3
243239
# traittypes
244240
traittypes==0.2.1
245241
# via ipydatawidgets
246-
typing-extensions==4.12.2
247-
# via
248-
# beautifulsoup4
249-
# ipython
250-
# mistune
251-
# pydata-sphinx-theme
252-
# referencing
253242
tzdata==2025.1
254243
# via pandas
255244
urllib3==2.3.0

requirements/mypy.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ mypy==1.15.0
1010
# via -r mypy.in
1111
mypy-extensions==1.0.0
1212
# via mypy
13-
typing-extensions==4.12.2
14-
# via mypy

0 commit comments

Comments
 (0)