Merge pull request #157 from scipp/update-essreduce

Update ESSreduce

pyproject.toml

@@ -32,7 +32,7 @@ requires-python = ">=3.10"
 dependencies = [
   "dask",
   "graphviz",
-  "essreduce>=24.07.1",
+  "essreduce>=24.08.0",
   "numpy",
   "pandas",
   "plopp",

requirements/base.in

@@ -4,7 +4,7 @@
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
 graphviz
-essreduce>=24.07.1
+essreduce>=24.08.0
 numpy
 pandas
 plopp

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:de9b98c06b7f66e8a4b7ad3c33a255c987e96668
+# SHA1:df4cf8a4a39fd2d213b55c8c11559ef6e4fe6fe1
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -27,7 +27,7 @@ dask==2024.7.1
     # via -r base.in
 decorator==5.1.1
     # via ipython
-essreduce==24.7.1
+essreduce==24.8.0
     # via -r base.in
 exceptiongroup==1.2.2
     # via ipython
@@ -45,7 +45,7 @@ h5py==3.11.0
     #   scippnexus
 idna==3.7
     # via requests
-importlib-metadata==8.0.0
+importlib-metadata==8.2.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
@@ -63,7 +63,7 @@ kiwisolver==1.4.5
     # via matplotlib
 locket==1.0.0
     # via partd
-matplotlib==3.9.1
+matplotlib==3.9.0
     # via
     #   mpltoolbox
     #   plopp

requirements/basetest.txt

@@ -13,7 +13,7 @@ packaging==24.1
     # via pytest
 pluggy==1.5.0
     # via pytest
-pytest==8.3.1
+pytest==8.3.2
     # via -r basetest.in
 tomli==2.0.1
     # via pytest

requirements/ci.txt

@@ -48,7 +48,7 @@ tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.16.0
+tox==4.17.0
     # via -r ci.in
 urllib3==2.2.2
     # via requests

requirements/dev.txt

@@ -123,7 +123,7 @@ webcolors==24.6.0
     # via jsonschema
 websocket-client==1.8.0
     # via jupyter-server
-wheel==0.43.0
+wheel==0.44.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/docs.txt

@@ -8,9 +8,9 @@
 -r base.txt
 accessible-pygments==0.0.5
     # via pydata-sphinx-theme
-alabaster==0.7.16
+alabaster==1.0.0
     # via sphinx
-attrs==23.2.0
+attrs==24.1.0
     # via
     #   jsonschema
     #   referencing
@@ -24,7 +24,7 @@ beautifulsoup4==4.12.3
     #   pydata-sphinx-theme
 bleach==6.1.0
     # via nbconvert
-debugpy==1.8.2
+debugpy==1.8.5
     # via ipykernel
 defusedxml==0.7.1
     # via nbconvert
@@ -77,7 +77,7 @@ mdurl==0.1.2
     # via markdown-it-py
 mistune==3.0.2
     # via nbconvert
-myst-parser==3.0.1
+myst-parser==4.0.0
     # via -r docs.in
 nbclient==0.10.0
     # via nbconvert
@@ -98,23 +98,23 @@ psutil==6.0.0
     # via ipykernel
 pydata-sphinx-theme==0.15.4
     # via -r docs.in
-pyzmq==26.0.3
+pyzmq==26.1.0
     # via
     #   ipykernel
     #   jupyter-client
 referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-rpds-py==0.19.0
+rpds-py==0.19.1
     # via
     #   jsonschema
     #   referencing
 snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.5
     # via beautifulsoup4
-sphinx==7.4.7
+sphinx==8.0.2
     # via
     #   -r docs.in
     #   myst-parser
@@ -127,19 +127,19 @@ sphinx-autodoc-typehints==2.2.3
     # via -r docs.in
 sphinx-copybutton==0.5.2
     # via -r docs.in
-sphinx-design==0.6.0
+sphinx-design==0.6.1
     # via -r docs.in
-sphinxcontrib-applehelp==1.0.8
+sphinxcontrib-applehelp==2.0.0
     # via sphinx
-sphinxcontrib-devhelp==1.0.6
+sphinxcontrib-devhelp==2.0.0
     # via sphinx
-sphinxcontrib-htmlhelp==2.0.6
+sphinxcontrib-htmlhelp==2.1.0
     # via sphinx
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-qthelp==1.0.8
+sphinxcontrib-qthelp==2.0.0
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.10
+sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 tinycss2==1.3.0
     # via nbconvert

requirements/mypy.txt

@@ -6,7 +6,7 @@
 #    pip-compile-multi
 #
 -r test.txt
-mypy==1.11.0
+mypy==1.11.1
     # via -r mypy.in
 mypy-extensions==1.0.0
     # via mypy

requirements/nightly.in

@@ -3,7 +3,7 @@
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
 graphviz
-essreduce>=24.07.1
+essreduce>=24.08.0
 numpy
 pandas
 pythreejs

requirements/nightly.txt

@@ -1,4 +1,4 @@
-# SHA1:77c0a073d6a32270c8a0d43370b38dac56ebcdd5
+# SHA1:be43a5b1af4d72a551d58901efa7bd4bb2c460ff
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -8,10 +8,6 @@
 -r basetest.txt
 asttokens==2.4.1
     # via stack-data
-certifi==2024.7.4
-    # via requests
-charset-normalizer==3.3.2
-    # via requests
 click==8.1.7
     # via dask
 cloudpickle==3.0.0
@@ -28,7 +24,7 @@ dask==2024.7.1
     # via -r nightly.in
 decorator==5.1.1
     # via ipython
-essreduce==24.7.1
+essreduce==24.8.0
     # via -r nightly.in
 executing==2.0.1
     # via stack-data
@@ -42,9 +38,7 @@ h5py==3.11.0
     # via
     #   scippneutron
     #   scippnexus
-idna==3.7
-    # via requests
-importlib-metadata==8.0.0
+importlib-metadata==8.2.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
@@ -62,7 +56,7 @@ kiwisolver==1.4.5
     # via matplotlib
 locket==1.0.0
     # via partd
-matplotlib==3.9.1
+matplotlib==3.9.0
     # via
     #   mpltoolbox
     #   plopp
@@ -95,14 +89,10 @@ pexpect==4.9.0
     # via ipython
 pillow==10.4.0
     # via matplotlib
-platformdirs==4.2.2
-    # via pooch
 plopp @ git+https://github.com/scipp/plopp@main
     # via
     #   -r nightly.in
     #   scippneutron
-pooch==1.8.2
-    # via scippneutron
 prompt-toolkit==3.0.47
     # via ipython
 ptyprocess==0.7.0
@@ -124,8 +114,6 @@ pytz==2024.1
     # via pandas
 pyyaml==6.0.1
     # via dask
-requests==2.32.3
-    # via pooch
 sciline @ git+https://github.com/scipp/sciline@main
     # via -r nightly.in
 scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
@@ -169,8 +157,6 @@ typing-extensions==4.12.2
     # via ipython
 tzdata==2024.1
     # via pandas
-urllib3==2.2.2
-    # via requests
 wcwidth==0.2.13
     # via prompt-toolkit
 widgetsnbextension==4.0.11

requirements/static.txt

@@ -17,7 +17,7 @@ nodeenv==1.9.1
     # via pre-commit
 platformdirs==4.2.2
     # via virtualenv
-pre-commit==3.7.1
+pre-commit==3.8.0
     # via -r static.in
 pyyaml==6.0.1
     # via pre-commit

src/ess/loki/workflow.py

@@ -10,6 +10,7 @@
     patch_monitor_data,
 )
 from ess.loki.io import load_nexus_monitor, load_nexus_source
+from ess.reduce.nexus.json_nexus import JSONGroup
 from ess.sans.conversions import monitor_to_wavelength, sans_monitor
 from ess.sans.types import (
     Filename,
@@ -22,7 +23,6 @@
     WavelengthBins,
     WavelengthMonitor,
 )
-from scippneutron.io.nexus.load_nexus import JSONGroup
 
 
 class MonitorHistogram(

tests/loki/live_reduction_test.py

@@ -4,7 +4,7 @@
 from ess.loki.workflow import LoKiMonitorWorkflow
 
 
-def loki_monitor_workflow_test() -> None:
+def test_loki_monitor_workflow() -> None:
     # Test building the sciline pipeline.
     workflow = LoKiMonitorWorkflow()
-    assert isinstance(workflow.pipeline, sl.pipeline)
+    assert isinstance(workflow.pipeline, sl.Pipeline)