Skip to content

Commit 67ae24d

Browse files
authored
Merge pull request #108 from scipp/nexus-to-tiff
feat: nexus to tiff helper
2 parents 90b0ff0 + abf02c8 commit 67ae24d

14 files changed

Lines changed: 164 additions & 45 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencies = [
3939
"scippnexus>=23.11.1",
4040
"tifffile>=2024.7.2",
4141
"essreduce>=25.07.0",
42+
"scitiff>=25.7",
4243
]
4344

4445
dynamic = ["version"]

requirements/base.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ scippneutron>=24.12.0
1111
scippnexus>=23.11.1
1212
tifffile>=2024.7.2
1313
essreduce>=25.07.0
14+
scitiff>=25.7

requirements/base.txt

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:e8f57e6a031654c00ff551e7789ffa4092c09047
1+
# SHA1:6defc0936ba7df6a0ee28ec9bb8beba6ed40db94
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -9,6 +9,10 @@ annotated-types==0.7.0
99
# via pydantic
1010
asttokens==3.0.0
1111
# via stack-data
12+
attrs==25.3.0
13+
# via
14+
# jsonschema
15+
# referencing
1216
click==8.2.1
1317
# via dask
1418
cloudpickle==3.1.1
@@ -21,15 +25,15 @@ cyclebane==24.10.0
2125
# via sciline
2226
cycler==0.12.1
2327
# via matplotlib
24-
dask==2025.7.0
28+
dask==2025.9.0
2529
# via -r base.in
2630
decorator==5.2.1
2731
# via ipython
28-
dnspython==2.7.0
32+
dnspython==2.8.0
2933
# via email-validator
3034
email-validator==2.3.0
3135
# via scippneutron
32-
essreduce==25.7.1
36+
essreduce==25.9.0
3337
# via -r base.in
3438
executing==2.2.1
3539
# via stack-data
@@ -67,6 +71,10 @@ ipywidgets==8.1.7
6771
# pythreejs
6872
jedi==0.19.2
6973
# via ipython
74+
jsonschema==4.25.1
75+
# via scitiff
76+
jsonschema-specifications==2025.9.1
77+
# via jsonschema
7078
jupyterlab-widgets==3.0.15
7179
# via ipywidgets
7280
kiwisolver==1.4.9
@@ -90,7 +98,7 @@ mpltoolbox==25.5.0
9098
# scippneutron
9199
networkx==3.5
92100
# via cyclebane
93-
numpy==2.3.2
101+
numpy==2.3.3
94102
# via
95103
# contourpy
96104
# h5py
@@ -128,7 +136,9 @@ ptyprocess==0.7.0
128136
pure-eval==0.2.3
129137
# via stack-data
130138
pydantic==2.11.7
131-
# via scippneutron
139+
# via
140+
# scippneutron
141+
# scitiff
132142
pydantic-core==2.33.2
133143
# via pydantic
134144
pygments==2.19.2
@@ -146,6 +156,14 @@ pythreejs==2.4.2
146156
# via plopp
147157
pyyaml==6.0.2
148158
# via dask
159+
referencing==0.36.2
160+
# via
161+
# jsonschema
162+
# jsonschema-specifications
163+
rpds-py==0.27.1
164+
# via
165+
# jsonschema
166+
# referencing
149167
sciline==25.8.0
150168
# via
151169
# -r base.in
@@ -157,6 +175,7 @@ scipp==25.8.0
157175
# plopp
158176
# scippneutron
159177
# scippnexus
178+
# scitiff
160179
scippneutron==25.7.0
161180
# via
162181
# -r base.in
@@ -166,16 +185,20 @@ scippnexus==25.6.0
166185
# -r base.in
167186
# essreduce
168187
# scippneutron
169-
scipy==1.16.1
188+
scipy==1.16.2
170189
# via
171190
# scippneutron
172191
# scippnexus
192+
scitiff==25.7.0
193+
# via -r base.in
173194
six==1.17.0
174195
# via python-dateutil
175196
stack-data==0.6.3
176197
# via ipython
177-
tifffile==2025.8.28
178-
# via -r base.in
198+
tifffile==2025.9.9
199+
# via
200+
# -r base.in
201+
# scitiff
179202
toolz==1.0.0
180203
# via
181204
# dask
@@ -195,6 +218,7 @@ typing-extensions==4.15.0
195218
# ipython
196219
# pydantic
197220
# pydantic-core
221+
# referencing
198222
# sciline
199223
# typing-inspection
200224
typing-inspection==0.4.1

requirements/basetest.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ iniconfig==2.1.0
2727
# via pytest
2828
jsonschema==4.25.1
2929
# via scitiff
30-
jsonschema-specifications==2025.4.1
30+
jsonschema-specifications==2025.9.1
3131
# via jsonschema
3232
kiwisolver==1.4.9
3333
# via matplotlib
@@ -37,7 +37,7 @@ lazy-loader==0.4
3737
# tof
3838
matplotlib==3.10.6
3939
# via plopp
40-
numpy==2.3.2
40+
numpy==2.3.3
4141
# via
4242
# contourpy
4343
# matplotlib
@@ -68,7 +68,7 @@ pygments==2.19.2
6868
# via pytest
6969
pyparsing==3.2.3
7070
# via matplotlib
71-
pytest==8.4.1
71+
pytest==8.4.2
7272
# via -r basetest.in
7373
python-dateutil==2.9.0.post0
7474
# via matplotlib
@@ -86,13 +86,13 @@ scipp==25.8.0
8686
# via
8787
# scitiff
8888
# tof
89-
scipy==1.16.1
89+
scipy==1.16.2
9090
# via tof
9191
scitiff==25.7.0
9292
# via -r basetest.in
9393
six==1.17.0
9494
# via python-dateutil
95-
tifffile==2025.8.28
95+
tifffile==2025.9.9
9696
# via scitiff
9797
tof==25.8.0
9898
# via -r basetest.in

requirements/ci.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ requests==2.32.5
4444
# via -r ci.in
4545
smmap==5.0.2
4646
# via gitdb
47-
tox==4.30.1
47+
tox==4.30.2
4848
# via -r ci.in
4949
urllib3==2.5.0
5050
# via requests

requirements/dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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.10.0
29+
copier==9.10.2
3030
# via -r dev.in
3131
dunamai==1.25.0
3232
# via copier
@@ -84,7 +84,7 @@ plumbum==1.9.0
8484
# via copier
8585
prometheus-client==0.22.1
8686
# via jupyter-server
87-
pycparser==2.22
87+
pycparser==2.23
8888
# via cffi
8989
python-json-logger==3.3.0
9090
# via jupyter-events

requirements/docs.txt

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ accessible-pygments==0.0.5
1010
# via pydata-sphinx-theme
1111
alabaster==1.0.0
1212
# via sphinx
13-
attrs==25.3.0
14-
# via
15-
# jsonschema
16-
# referencing
1713
autodoc-pydantic==2.2.0
1814
# via -r docs.in
1915
babel==2.17.0
@@ -52,10 +48,6 @@ jinja2==3.1.6
5248
# nbconvert
5349
# nbsphinx
5450
# sphinx
55-
jsonschema==4.25.1
56-
# via nbformat
57-
jsonschema-specifications==2025.4.1
58-
# via jsonschema
5951
jupyter-client==8.6.3
6052
# via
6153
# ipykernel
@@ -114,22 +106,14 @@ pydata-sphinx-theme==0.16.1
114106
# via -r docs.in
115107
python-dotenv==1.1.1
116108
# via pydantic-settings
117-
pyzmq==27.0.2
109+
pyzmq==27.1.0
118110
# via
119111
# ipykernel
120112
# jupyter-client
121-
referencing==0.36.2
122-
# via
123-
# jsonschema
124-
# jsonschema-specifications
125113
requests==2.32.5
126114
# via
127115
# pooch
128116
# sphinx
129-
rpds-py==0.27.1
130-
# via
131-
# jsonschema
132-
# referencing
133117
snowballstemmer==3.0.1
134118
# via sphinx
135119
soupsieve==2.8

requirements/mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# requirements upgrade
77
#
88
-r test.txt
9-
mypy==1.17.1
9+
mypy==1.18.1
1010
# via -r mypy.in
1111
mypy-extensions==1.1.0
1212
# via mypy

requirements/nightly.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
dask>=2022.1.0
55
graphviz
66
tifffile>=2024.7.2
7+
scitiff>=25.7
78
pytest>=7.0
89
pooch>=1.5
910
scitiff>=24.6.0

requirements/nightly.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:7ef80f3a29e8a52af73a0a06a460350d4ed98b13
1+
# SHA1:677e0bbdac5b108c13ecc0fd99b9ce977011e5c2
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -28,9 +28,9 @@ cyclebane==24.10.0
2828
# via sciline
2929
cycler==0.12.1
3030
# via matplotlib
31-
dask==2025.7.0
31+
dask==2025.9.0
3232
# via -r nightly.in
33-
dnspython==2.8.0rc1
33+
dnspython==2.8.0
3434
# via email-validator
3535
email-validator==2.3.0
3636
# via scippneutron
@@ -56,7 +56,7 @@ iniconfig==2.1.0
5656
# via pytest
5757
jsonschema==4.25.1
5858
# via scitiff
59-
jsonschema-specifications==2025.4.1
59+
jsonschema-specifications==2025.9.1
6060
# via jsonschema
6161
kiwisolver==1.4.10rc0
6262
# via matplotlib
@@ -75,7 +75,7 @@ mpltoolbox==25.5.0
7575
# via scippneutron
7676
networkx==3.5
7777
# via cyclebane
78-
numpy==2.3.2
78+
numpy==2.3.3
7979
# via
8080
# contourpy
8181
# h5py
@@ -116,7 +116,7 @@ pygments==2.19.2
116116
# via pytest
117117
pyparsing==3.2.3
118118
# via matplotlib
119-
pytest==8.4.1
119+
pytest==8.4.2
120120
# via -r nightly.in
121121
python-dateutil==2.9.0.post0
122122
# via
@@ -155,7 +155,7 @@ scippnexus @ git+https://github.com/scipp/scippnexus@main
155155
# -r nightly.in
156156
# essreduce
157157
# scippneutron
158-
scipy==1.16.1
158+
scipy==1.16.2
159159
# via
160160
# scippneutron
161161
# scippnexus
@@ -164,7 +164,7 @@ scitiff==25.7.0
164164
# via -r nightly.in
165165
six==1.17.0
166166
# via python-dateutil
167-
tifffile==2025.8.28
167+
tifffile==2025.9.9
168168
# via
169169
# -r nightly.in
170170
# scitiff

0 commit comments

Comments
 (0)