Skip to content

Commit 2d75b28

Browse files
authored
Merge pull request #242 from scipp/new-instrument-view
Updates to Dream instrument view
2 parents 8e84219 + d98d4ad commit 2d75b28

File tree

12 files changed

+148
-190
lines changed

12 files changed

+148
-190
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies = [
3434
"essreduce>=25.12.1",
3535
"graphviz",
3636
"numpy>=2",
37-
"plopp>=25.07.0",
37+
"plopp>=26.2.0",
3838
"pythreejs>=2.4.1",
3939
"sciline>=25.04.1",
4040
"scipp>=25.11.0",

requirements/base.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
dask>=2022.1.0
66
essreduce>=25.12.1
77
graphviz
8-
numpy>=1.25
9-
plopp>=25.07.0
8+
numpy>=2
9+
plopp>=26.2.0
1010
pythreejs>=2.4.1
1111
sciline>=25.04.1
1212
scipp>=25.11.0

requirements/base.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:40cd03cd4a9e9632db0eebb7d094cb1a55638372
1+
# SHA1:303c70637d6536773db66ff40b4306cd86aee2c0
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -27,15 +27,15 @@ cyclebane==24.10.0
2727
# via sciline
2828
cycler==0.12.1
2929
# via matplotlib
30-
dask==2026.1.1
30+
dask==2026.1.2
3131
# via -r base.in
3232
decorator==5.2.1
3333
# via ipython
3434
dnspython==2.8.0
3535
# via email-validator
3636
email-validator==2.3.0
3737
# via scippneutron
38-
essreduce==26.1.1
38+
essreduce==26.2.0
3939
# via -r base.in
4040
executing==2.2.1
4141
# via stack-data
@@ -59,7 +59,7 @@ importlib-metadata==8.7.1
5959
# via dask
6060
ipydatawidgets==4.3.5
6161
# via pythreejs
62-
ipython==9.9.0
62+
ipython==9.10.0
6363
# via ipywidgets
6464
ipython-pygments-lexers==1.1.1
6565
# via ipython
@@ -97,7 +97,7 @@ ncrystal-python==4.2.12
9797
# via ncrystal
9898
networkx==3.6.1
9999
# via cyclebane
100-
numpy==2.4.1
100+
numpy==2.4.2
101101
# via
102102
# -r base.in
103103
# ase
@@ -127,12 +127,12 @@ pillow==12.1.0
127127
# via matplotlib
128128
platformdirs==4.5.1
129129
# via pooch
130-
plopp==25.11.0
130+
plopp==26.2.0
131131
# via
132132
# -r base.in
133133
# scippneutron
134134
# tof
135-
pooch==1.8.2
135+
pooch==1.9.0
136136
# via tof
137137
prompt-toolkit==3.0.52
138138
# via ipython
@@ -164,7 +164,7 @@ sciline==25.11.1
164164
# via
165165
# -r base.in
166166
# essreduce
167-
scipp==26.1.1
167+
scipp==26.2.0
168168
# via
169169
# -r base.in
170170
# essreduce
@@ -175,7 +175,7 @@ scippneutron==25.11.2
175175
# via
176176
# -r base.in
177177
# essreduce
178-
scippnexus==26.1.0
178+
scippnexus==26.1.1
179179
# via
180180
# -r base.in
181181
# essreduce
@@ -219,7 +219,7 @@ typing-inspection==0.4.2
219219
# via pydantic
220220
urllib3==2.6.3
221221
# via requests
222-
wcwidth==0.3.0
222+
wcwidth==0.5.3
223223
# via prompt-toolkit
224224
widgetsnbextension==4.0.15
225225
# via ipywidgets

requirements/basetest.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ idna==3.11
2121
# via requests
2222
iniconfig==2.3.0
2323
# via pytest
24-
ipython==9.9.0
24+
ipython==9.10.0
2525
# via ipywidgets
2626
ipython-pygments-lexers==1.1.1
2727
# via ipython
@@ -33,7 +33,7 @@ jupyterlab-widgets==3.0.16
3333
# via ipywidgets
3434
matplotlib-inline==0.2.1
3535
# via ipython
36-
numpy==2.4.1
36+
numpy==2.4.2
3737
# via pandas
3838
packaging==26.0
3939
# via
@@ -49,7 +49,7 @@ platformdirs==4.5.1
4949
# via pooch
5050
pluggy==1.6.0
5151
# via pytest
52-
pooch==1.8.2
52+
pooch==1.9.0
5353
# via -r basetest.in
5454
prompt-toolkit==3.0.52
5555
# via ipython
@@ -81,7 +81,7 @@ typing-extensions==4.15.0
8181
# via ipython
8282
urllib3==2.6.3
8383
# via requests
84-
wcwidth==0.3.0
84+
wcwidth==0.5.3
8585
# via prompt-toolkit
8686
widgetsnbextension==4.0.15
8787
# via ipywidgets

requirements/ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# requirements upgrade
77
#
8-
cachetools==6.2.4
8+
cachetools==7.0.0
99
# via tox
1010
certifi==2026.1.4
1111
# via requests

requirements/dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async-lru==2.1.0
2626
# via jupyterlab
2727
cffi==2.0.0
2828
# via argon2-cffi-bindings
29-
copier==9.11.2
29+
copier==9.11.3
3030
# via -r dev.in
3131
dunamai==1.25.0
3232
# via copier
@@ -65,7 +65,7 @@ jupyter-server==2.17.0
6565
# notebook-shim
6666
jupyter-server-terminals==0.5.4
6767
# via jupyter-server
68-
jupyterlab==4.5.2
68+
jupyterlab==4.5.3
6969
# via -r dev.in
7070
jupyterlab-server==2.28.0
7171
# via jupyterlab
@@ -115,7 +115,7 @@ webcolors==25.10.0
115115
# via jsonschema
116116
websocket-client==1.9.0
117117
# via jupyter-server
118-
wheel==0.46.2
118+
wheel==0.46.3
119119
# via pip-tools
120120

121121
# The following packages are considered to be unsafe in a requirements file:

requirements/docs.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ attrs==25.4.0
1616
# referencing
1717
autodoc-pydantic==2.2.0
1818
# via -r docs.in
19-
babel==2.17.0
19+
babel==2.18.0
2020
# via
2121
# pydata-sphinx-theme
2222
# sphinx
@@ -26,7 +26,7 @@ beautifulsoup4==4.14.3
2626
# pydata-sphinx-theme
2727
bleach[css]==6.3.0
2828
# via nbconvert
29-
debugpy==1.8.19
29+
debugpy==1.8.20
3030
# via ipykernel
3131
defusedxml==0.7.1
3232
# via nbconvert
@@ -89,7 +89,7 @@ myst-parser==5.0.0
8989
# via -r docs.in
9090
nbclient==0.10.4
9191
# via nbconvert
92-
nbconvert==7.16.6
92+
nbconvert==7.17.0
9393
# via nbsphinx
9494
nbformat==5.10.4
9595
# via
@@ -104,7 +104,7 @@ pandas==3.0.0
104104
# via -r docs.in
105105
pandocfilters==1.5.1
106106
# via nbconvert
107-
psutil==7.2.1
107+
psutil==7.2.2
108108
# via ipykernel
109109
pyarrow==23.0.0
110110
# via -r docs.in

requirements/mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ mypy==1.19.1
1212
# via -r mypy.in
1313
mypy-extensions==1.1.0
1414
# via mypy
15-
pathspec==1.0.3
15+
pathspec==1.0.4
1616
# via mypy

requirements/nightly.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
44
dask>=2022.1.0
55
graphviz
6-
numpy>=1.25
6+
numpy>=2
77
pythreejs>=2.4.1
88
ncrystal[cif]>=4.1.0
99
spglib!=2.7

requirements/nightly.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:c7ea57c5e953bfa839536ce478aea6b0964cf25a
1+
# SHA1:02c4ca6025e8a899b9987d08704c722ee69e177a
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -30,7 +30,7 @@ cyclebane==24.10.0
3030
# via sciline
3131
cycler==0.12.1
3232
# via matplotlib
33-
dask==2026.1.1
33+
dask==2026.1.2
3434
# via -r nightly.in
3535
decorator==5.2.1
3636
# via ipython
@@ -64,7 +64,7 @@ iniconfig==2.3.0
6464
# via pytest
6565
ipydatawidgets==4.3.5
6666
# via pythreejs
67-
ipython==9.9.0
67+
ipython==9.10.0
6868
# via ipywidgets
6969
ipython-pygments-lexers==1.1.1
7070
# via ipython
@@ -103,12 +103,11 @@ ncrystal-python==4.2.12
103103
# via ncrystal
104104
networkx==3.6.1
105105
# via cyclebane
106-
numpy==2.3.5
106+
numpy==2.4.2
107107
# via
108108
# -r nightly.in
109109
# ase
110110
# contourpy
111-
# essreduce
112111
# h5py
113112
# ipydatawidgets
114113
# matplotlib
@@ -145,7 +144,7 @@ plopp @ git+https://github.com/scipp/plopp@main
145144
# tof
146145
pluggy==1.6.0
147146
# via pytest
148-
pooch==1.8.2
147+
pooch==1.9.0
149148
# via
150149
# -r nightly.in
151150
# tof
@@ -238,7 +237,7 @@ typing-inspection==0.4.2
238237
# via pydantic
239238
urllib3==2.6.3
240239
# via requests
241-
wcwidth==0.3.0
240+
wcwidth==0.5.3
242241
# via prompt-toolkit
243242
widgetsnbextension==4.0.15
244243
# via ipywidgets

0 commit comments

Comments
 (0)