Skip to content

Commit 45b8fd4

Browse files
SimonHeybrockSimonHeybrock
authored
Merge pull request #95 from scipp/update-for-ess-reduce-nexus
Update import locations for new ESSreduce nexus module
2 parents a0f8015 + ac4bfff commit 45b8fd4

File tree

14 files changed

+52
-51
lines changed

14 files changed

+52
-51
lines changed

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ requires-python = ">=3.10"
3131
# Make sure to list one dependency per line.
3232
dependencies = [
3333
"dask",
34-
"essreduce>=24.08.2",
34+
"essreduce>=24.10.0",
3535
"graphviz",
3636
"numpy",
3737
"plopp",

‎requirements/base.in

+1-1
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>=24.08.2
6+
essreduce>=24.10.0
77
graphviz
88
numpy
99
plopp

‎requirements/base.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:2cad3df672e12033fa21254667278ceafae15e09
1+
# SHA1:3edca7ef7f02d8df072e91ce62fa7acd26cc0825
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -19,23 +19,23 @@ cyclebane==24.6.0
1919
# via sciline
2020
cycler==0.12.1
2121
# via matplotlib
22-
dask==2024.9.0
22+
dask==2024.9.1
2323
# via -r base.in
2424
decorator==5.1.1
2525
# via ipython
26-
essreduce==24.9.1
26+
essreduce==24.10.0
2727
# via -r base.in
2828
exceptiongroup==1.2.2
2929
# via ipython
3030
executing==2.1.0
3131
# via stack-data
32-
fonttools==4.53.1
32+
fonttools==4.54.1
3333
# via matplotlib
3434
fsspec==2024.9.0
3535
# via dask
3636
graphviz==0.20.3
3737
# via -r base.in
38-
h5py==3.11.0
38+
h5py==3.12.1
3939
# via
4040
# scippneutron
4141
# scippnexus
@@ -91,11 +91,11 @@ pexpect==4.9.0
9191
# via ipython
9292
pillow==10.4.0
9393
# via matplotlib
94-
plopp==24.9.1
94+
plopp==24.9.3
9595
# via
9696
# -r base.in
9797
# scippneutron
98-
prompt-toolkit==3.0.47
98+
prompt-toolkit==3.0.48
9999
# via ipython
100100
ptyprocess==0.7.0
101101
# via pexpect
@@ -125,7 +125,7 @@ scipp==24.9.1
125125
# scippnexus
126126
scippneutron==24.9.0
127127
# via -r base.in
128-
scippnexus==24.9.0
128+
scippnexus==24.9.1
129129
# via
130130
# -r base.in
131131
# essreduce

‎requirements/basetest.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ packaging==24.1
2121
# via
2222
# pooch
2323
# pytest
24-
pandas==2.2.2
24+
pandas==2.2.3
2525
# via -r basetest.in
2626
platformdirs==4.3.6
2727
# via pooch
@@ -41,7 +41,7 @@ six==1.16.0
4141
# via python-dateutil
4242
tomli==2.0.1
4343
# via pytest
44-
tzdata==2024.1
44+
tzdata==2024.2
4545
# via pandas
4646
urllib3==2.2.3
4747
# via requests

‎requirements/ci.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ tomli==2.0.1
4848
# via
4949
# pyproject-api
5050
# tox
51-
tox==4.20.0
51+
tox==4.21.0
5252
# via -r ci.in
53+
typing-extensions==4.12.2
54+
# via tox
5355
urllib3==2.2.3
5456
# via requests
55-
virtualenv==20.26.5
57+
virtualenv==20.26.6
5658
# via tox

‎requirements/dev.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
-r wheels.txt
1515
annotated-types==0.7.0
1616
# via pydantic
17-
anyio==4.4.0
17+
anyio==4.6.0
1818
# via
1919
# httpx
2020
# jupyter-server
@@ -38,7 +38,7 @@ funcy==2.0
3838
# via copier
3939
h11==0.14.0
4040
# via httpcore
41-
httpcore==1.0.5
41+
httpcore==1.0.6
4242
# via httpx
4343
httpx==0.27.2
4444
# via jupyterlab
@@ -83,7 +83,7 @@ pip-tools==7.4.1
8383
# via pip-compile-multi
8484
plumbum==1.8.3
8585
# via copier
86-
prometheus-client==0.20.0
86+
prometheus-client==0.21.0
8787
# via jupyter-server
8888
pycparser==2.22
8989
# via cffi

‎requirements/docs.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ certifi==2024.8.30
2828
# via requests
2929
charset-normalizer==3.3.2
3030
# via requests
31-
debugpy==1.8.5
31+
debugpy==1.8.6
3232
# via ipykernel
3333
defusedxml==0.7.1
3434
# via nbconvert
@@ -106,7 +106,7 @@ nbsphinx==0.9.5
106106
# via -r docs.in
107107
nest-asyncio==1.6.0
108108
# via ipykernel
109-
pandas==2.2.2
109+
pandas==2.2.3
110110
# via -r docs.in
111111
pandocfilters==1.5.1
112112
# via nbconvert
@@ -188,7 +188,7 @@ tornado==6.4.1
188188
# via
189189
# ipykernel
190190
# jupyter-client
191-
tzdata==2024.1
191+
tzdata==2024.2
192192
# via pandas
193193
urllib3==2.2.3
194194
# via requests

‎requirements/nightly.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ cyclebane==24.6.0
2020
# via sciline
2121
cycler==0.12.1
2222
# via matplotlib
23-
dask==2024.9.0
23+
dask==2024.9.1
2424
# via -r nightly.in
2525
decorator==5.1.1
2626
# via ipython
2727
essreduce @ git+https://github.com/scipp/essreduce@main
2828
# via -r nightly.in
2929
executing==2.1.0
3030
# via stack-data
31-
fonttools==4.53.1
31+
fonttools==4.54.1
3232
# via matplotlib
3333
fsspec==2024.9.0
3434
# via dask
3535
graphviz==0.20.3
3636
# via -r nightly.in
37-
h5py==3.11.0
37+
h5py==3.12.1
3838
# via
3939
# scippneutron
4040
# scippnexus
@@ -78,7 +78,7 @@ plopp @ git+https://github.com/scipp/plopp@main
7878
# via
7979
# -r nightly.in
8080
# scippneutron
81-
prompt-toolkit==3.0.47
81+
prompt-toolkit==3.0.48
8282
# via ipython
8383
ptyprocess==0.7.0
8484
# via pexpect

‎requirements/static.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ pre-commit==3.8.0
2121
# via -r static.in
2222
pyyaml==6.0.2
2323
# via pre-commit
24-
virtualenv==20.26.5
24+
virtualenv==20.26.6
2525
# via pre-commit

‎requirements/wheels.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build==1.2.2
99
# via -r wheels.in
1010
packaging==24.1
1111
# via build
12-
pyproject-hooks==1.1.0
12+
pyproject-hooks==1.2.0
1313
# via build
1414
tomli==2.0.1
1515
# via build

‎src/ess/dream/io/geant4.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
NeXusSource,
1818
RunType,
1919
)
20-
from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
20+
from ess.reduce.nexus.workflow import GenericNeXusWorkflow
2121

2222
MANTLE_DETECTOR_ID = sc.index(7)
2323
HIGH_RES_DETECTOR_ID = sc.index(8)

‎src/ess/dream/io/nexus.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import sciline
1717

18-
from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
1918
from ess.reduce.nexus.types import DetectorBankSizes
19+
from ess.reduce.nexus.workflow import GenericNeXusWorkflow
2020

2121
DETECTOR_BANK_SIZES = {
2222
"endcap_backward_detector": {

‎src/ess/powder/types.py

+20-21
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,31 @@
1414
import scipp as sc
1515
from scippneutron.io import cif
1616

17-
from ess.reduce.nexus import generic_types as reduce_gt
1817
from ess.reduce.nexus import types as reduce_t
1918
from ess.reduce.uncertainty import UncertaintyBroadcastMode as _UncertaintyBroadcastMode
2019

2120
# 1 TypeVars used to parametrize the generic parts of the workflow
2221

23-
BackgroundRun = reduce_gt.BackgroundRun
24-
CalibratedDetector = reduce_gt.CalibratedDetector
25-
CalibratedMonitor = reduce_gt.CalibratedMonitor
26-
DetectorData = reduce_gt.DetectorData
27-
DetectorPositionOffset = reduce_gt.DetectorPositionOffset
28-
EmptyBeamRun = reduce_gt.EmptyBeamRun
29-
Filename = reduce_gt.Filename
30-
MonitorData = reduce_gt.MonitorData
31-
MonitorPositionOffset = reduce_gt.MonitorPositionOffset
32-
MonitorType = reduce_gt.MonitorType
33-
NeXusMonitorName = reduce_gt.NeXusMonitorName
34-
NeXusDetector = reduce_gt.NeXusDetector
35-
NeXusMonitor = reduce_gt.NeXusMonitor
36-
NeXusSample = reduce_gt.NeXusSample
37-
NeXusSource = reduce_gt.NeXusSource
38-
RunType = reduce_gt.RunType
39-
SampleRun = reduce_gt.SampleRun
40-
SamplePosition = reduce_gt.SamplePosition
41-
SourcePosition = reduce_gt.SourcePosition
42-
VanadiumRun = reduce_gt.VanadiumRun
22+
BackgroundRun = reduce_t.BackgroundRun
23+
CalibratedDetector = reduce_t.CalibratedDetector
24+
CalibratedMonitor = reduce_t.CalibratedMonitor
25+
DetectorData = reduce_t.DetectorData
26+
DetectorPositionOffset = reduce_t.DetectorPositionOffset
27+
EmptyBeamRun = reduce_t.EmptyBeamRun
28+
Filename = reduce_t.Filename
29+
MonitorData = reduce_t.MonitorData
30+
MonitorPositionOffset = reduce_t.MonitorPositionOffset
31+
MonitorType = reduce_t.MonitorType
32+
NeXusMonitorName = reduce_t.NeXusMonitorName
33+
NeXusDetector = reduce_t.NeXusDetector
34+
NeXusMonitor = reduce_t.NeXusMonitor
35+
NeXusSample = reduce_t.NeXusSample
36+
NeXusSource = reduce_t.NeXusSource
37+
RunType = reduce_t.RunType
38+
SampleRun = reduce_t.SampleRun
39+
SamplePosition = reduce_t.SamplePosition
40+
SourcePosition = reduce_t.SourcePosition
41+
VanadiumRun = reduce_t.VanadiumRun
4342

4443
DetectorBankSizes = reduce_t.DetectorBankSizes
4544
NeXusDetectorName = reduce_t.NeXusDetectorName

‎tests/dream/io/nexus_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
import ess.dream.data # noqa: F401
88
from ess import dream
9-
from ess.reduce.nexus.generic_types import (
9+
from ess.reduce.nexus.types import (
1010
CalibratedDetector,
1111
CalibratedMonitor,
1212
DetectorData,
1313
Filename,
1414
Monitor1,
15+
NeXusDetectorName,
1516
NeXusMonitorName,
1617
SampleRun,
1718
)
18-
from ess.reduce.nexus.types import NeXusDetectorName
1919

2020
bank_dims = {'wire', 'module', 'segment', 'strip', 'counter'}
2121
hr_sans_dims = {'strip', 'other'}

0 commit comments

Comments
 (0)