Merge pull request #95 from scipp/update-for-ess-reduce-nexus

SimonHeybrock · web-flow · commit 45b8fd4c6444 · 2024-10-03T09:13:33.000+02:00
Update import locations for new ESSreduce nexus module
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ requires-python = ">=3.10"
 # Make sure to list one dependency per line.
 dependencies = [
   "dask",
-  "essreduce>=24.08.2",
+  "essreduce>=24.10.0",
   "graphviz",
   "numpy",
   "plopp",
diff --git a/requirements/base.in b/requirements/base.in
@@ -3,7 +3,7 @@
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
-essreduce>=24.08.2
+essreduce>=24.10.0
 graphviz
 numpy
 plopp
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:2cad3df672e12033fa21254667278ceafae15e09
+# SHA1:3edca7ef7f02d8df072e91ce62fa7acd26cc0825
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -19,23 +19,23 @@ cyclebane==24.6.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.9.0
+dask==2024.9.1
     # via -r base.in
 decorator==5.1.1
     # via ipython
-essreduce==24.9.1
+essreduce==24.10.0
     # via -r base.in
 exceptiongroup==1.2.2
     # via ipython
 executing==2.1.0
     # via stack-data
-fonttools==4.53.1
+fonttools==4.54.1
     # via matplotlib
 fsspec==2024.9.0
     # via dask
 graphviz==0.20.3
     # via -r base.in
-h5py==3.11.0
+h5py==3.12.1
     # via
     #   scippneutron
     #   scippnexus
@@ -91,11 +91,11 @@ pexpect==4.9.0
     # via ipython
 pillow==10.4.0
     # via matplotlib
-plopp==24.9.1
+plopp==24.9.3
     # via
     #   -r base.in
     #   scippneutron
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
@@ -125,7 +125,7 @@ scipp==24.9.1
     #   scippnexus
 scippneutron==24.9.0
     # via -r base.in
-scippnexus==24.9.0
+scippnexus==24.9.1
     # via
     #   -r base.in
     #   essreduce
diff --git a/requirements/basetest.txt b/requirements/basetest.txt
@@ -21,7 +21,7 @@ packaging==24.1
     # via
     #   pooch
     #   pytest
-pandas==2.2.2
+pandas==2.2.3
     # via -r basetest.in
 platformdirs==4.3.6
     # via pooch
@@ -41,7 +41,7 @@ six==1.16.0
     # via python-dateutil
 tomli==2.0.1
     # via pytest
-tzdata==2024.1
+tzdata==2024.2
     # via pandas
 urllib3==2.2.3
     # via requests
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -48,9 +48,11 @@ tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.20.0
+tox==4.21.0
     # via -r ci.in
+typing-extensions==4.12.2
+    # via tox
 urllib3==2.2.3
     # via requests
-virtualenv==20.26.5
+virtualenv==20.26.6
     # via tox
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -14,7 +14,7 @@
 -r wheels.txt
 annotated-types==0.7.0
     # via pydantic
-anyio==4.4.0
+anyio==4.6.0
     # via
     #   httpx
     #   jupyter-server
@@ -38,7 +38,7 @@ funcy==2.0
     # via copier
 h11==0.14.0
     # via httpcore
-httpcore==1.0.5
+httpcore==1.0.6
     # via httpx
 httpx==0.27.2
     # via jupyterlab
@@ -83,7 +83,7 @@ pip-tools==7.4.1
     # via pip-compile-multi
 plumbum==1.8.3
     # via copier
-prometheus-client==0.20.0
+prometheus-client==0.21.0
     # via jupyter-server
 pycparser==2.22
     # via cffi
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -28,7 +28,7 @@ certifi==2024.8.30
     # via requests
 charset-normalizer==3.3.2
     # via requests
-debugpy==1.8.5
+debugpy==1.8.6
     # via ipykernel
 defusedxml==0.7.1
     # via nbconvert
@@ -106,7 +106,7 @@ nbsphinx==0.9.5
     # via -r docs.in
 nest-asyncio==1.6.0
     # via ipykernel
-pandas==2.2.2
+pandas==2.2.3
     # via -r docs.in
 pandocfilters==1.5.1
     # via nbconvert
@@ -188,7 +188,7 @@ tornado==6.4.1
     # via
     #   ipykernel
     #   jupyter-client
-tzdata==2024.1
+tzdata==2024.2
     # via pandas
 urllib3==2.2.3
     # via requests
diff --git a/requirements/nightly.txt b/requirements/nightly.txt
@@ -20,21 +20,21 @@ cyclebane==24.6.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.9.0
+dask==2024.9.1
     # via -r nightly.in
 decorator==5.1.1
     # via ipython
 essreduce @ git+https://github.com/scipp/essreduce@main
     # via -r nightly.in
 executing==2.1.0
     # via stack-data
-fonttools==4.53.1
+fonttools==4.54.1
     # via matplotlib
 fsspec==2024.9.0
     # via dask
 graphviz==0.20.3
     # via -r nightly.in
-h5py==3.11.0
+h5py==3.12.1
     # via
     #   scippneutron
     #   scippnexus
@@ -78,7 +78,7 @@ plopp @ git+https://github.com/scipp/plopp@main
     # via
     #   -r nightly.in
     #   scippneutron
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
diff --git a/requirements/static.txt b/requirements/static.txt
@@ -21,5 +21,5 @@ pre-commit==3.8.0
     # via -r static.in
 pyyaml==6.0.2
     # via pre-commit
-virtualenv==20.26.5
+virtualenv==20.26.6
     # via pre-commit
diff --git a/requirements/wheels.txt b/requirements/wheels.txt
@@ -9,7 +9,7 @@ build==1.2.2
     # via -r wheels.in
 packaging==24.1
     # via build
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via build
 tomli==2.0.1
     # via build
diff --git a/src/ess/dream/io/geant4.py b/src/ess/dream/io/geant4.py
@@ -17,7 +17,7 @@
     NeXusSource,
     RunType,
 )
-from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
+from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
 MANTLE_DETECTOR_ID = sc.index(7)
 HIGH_RES_DETECTOR_ID = sc.index(8)
diff --git a/src/ess/dream/io/nexus.py b/src/ess/dream/io/nexus.py
@@ -15,8 +15,8 @@
 
 import sciline
 
-from ess.reduce.nexus.generic_workflow import GenericNeXusWorkflow
 from ess.reduce.nexus.types import DetectorBankSizes
+from ess.reduce.nexus.workflow import GenericNeXusWorkflow
 
 DETECTOR_BANK_SIZES = {
     "endcap_backward_detector": {
diff --git a/src/ess/powder/types.py b/src/ess/powder/types.py
@@ -14,32 +14,31 @@
 import scipp as sc
 from scippneutron.io import cif
 
-from ess.reduce.nexus import generic_types as reduce_gt
 from ess.reduce.nexus import types as reduce_t
 from ess.reduce.uncertainty import UncertaintyBroadcastMode as _UncertaintyBroadcastMode
 
 # 1 TypeVars used to parametrize the generic parts of the workflow
 
-BackgroundRun = reduce_gt.BackgroundRun
-CalibratedDetector = reduce_gt.CalibratedDetector
-CalibratedMonitor = reduce_gt.CalibratedMonitor
-DetectorData = reduce_gt.DetectorData
-DetectorPositionOffset = reduce_gt.DetectorPositionOffset
-EmptyBeamRun = reduce_gt.EmptyBeamRun
-Filename = reduce_gt.Filename
-MonitorData = reduce_gt.MonitorData
-MonitorPositionOffset = reduce_gt.MonitorPositionOffset
-MonitorType = reduce_gt.MonitorType
-NeXusMonitorName = reduce_gt.NeXusMonitorName
-NeXusDetector = reduce_gt.NeXusDetector
-NeXusMonitor = reduce_gt.NeXusMonitor
-NeXusSample = reduce_gt.NeXusSample
-NeXusSource = reduce_gt.NeXusSource
-RunType = reduce_gt.RunType
-SampleRun = reduce_gt.SampleRun
-SamplePosition = reduce_gt.SamplePosition
-SourcePosition = reduce_gt.SourcePosition
-VanadiumRun = reduce_gt.VanadiumRun
+BackgroundRun = reduce_t.BackgroundRun
+CalibratedDetector = reduce_t.CalibratedDetector
+CalibratedMonitor = reduce_t.CalibratedMonitor
+DetectorData = reduce_t.DetectorData
+DetectorPositionOffset = reduce_t.DetectorPositionOffset
+EmptyBeamRun = reduce_t.EmptyBeamRun
+Filename = reduce_t.Filename
+MonitorData = reduce_t.MonitorData
+MonitorPositionOffset = reduce_t.MonitorPositionOffset
+MonitorType = reduce_t.MonitorType
+NeXusMonitorName = reduce_t.NeXusMonitorName
+NeXusDetector = reduce_t.NeXusDetector
+NeXusMonitor = reduce_t.NeXusMonitor
+NeXusSample = reduce_t.NeXusSample
+NeXusSource = reduce_t.NeXusSource
+RunType = reduce_t.RunType
+SampleRun = reduce_t.SampleRun
+SamplePosition = reduce_t.SamplePosition
+SourcePosition = reduce_t.SourcePosition
+VanadiumRun = reduce_t.VanadiumRun
 
 DetectorBankSizes = reduce_t.DetectorBankSizes
 NeXusDetectorName = reduce_t.NeXusDetectorName
diff --git a/tests/dream/io/nexus_test.py b/tests/dream/io/nexus_test.py
@@ -6,16 +6,16 @@
 
 import ess.dream.data  # noqa: F401
 from ess import dream
-from ess.reduce.nexus.generic_types import (
+from ess.reduce.nexus.types import (
     CalibratedDetector,
     CalibratedMonitor,
     DetectorData,
     Filename,
     Monitor1,
+    NeXusDetectorName,
     NeXusMonitorName,
     SampleRun,
 )
-from ess.reduce.nexus.types import NeXusDetectorName
 
 bank_dims = {'wire', 'module', 'segment', 'strip', 'counter'}
 hr_sans_dims = {'strip', 'other'}
