Merge pull request #10 from scipp/nexus-loaders

Generic NeXus loaders

conda/meta.yaml

@@ -12,6 +12,8 @@ requirements:
     - setuptools_scm
   run:
     - python>=3.10
+    - scipp >= 24.02.0
+    - scippnexus >= 24.03.0
 
 test:
   imports:

docs/api-reference/index.md

@@ -26,4 +26,6 @@
    :toctree: ../generated/modules
    :template: module-template.rst
    :recursive:
+
+   nexus
 ```

pyproject.toml

@@ -30,6 +30,8 @@ requires-python = ">=3.10"
 # Run 'tox -e deps' after making changes here. This will update requirement files.
 # Make sure to list one dependency per line.
 dependencies = [
+    "scipp >= 24.02.0",
+    "scippnexus >= 24.03.0",
 ]
 
 dynamic = ["version"]

requirements/base.in

@@ -2,4 +2,5 @@
 # will not be touched by ``make_base.py``
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
-
+scipp >= 24.02.0
+scippnexus >= 24.03.0

requirements/base.txt

@@ -1,8 +1,26 @@
-# SHA1:da39a3ee5e6b4b0d3255bfef95601890afd80709
+# SHA1:b5fdb6600edc83ab95fb0e848607edef52cdd293
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
-
+h5py==3.10.0
+    # via scippnexus
+numpy==1.26.4
+    # via
+    #   h5py
+    #   scipp
+    #   scipy
+python-dateutil==2.9.0.post0
+    # via scippnexus
+scipp==24.2.0
+    # via
+    #   -r base.in
+    #   scippnexus
+scippnexus==24.3.1
+    # via -r base.in
+scipy==1.12.0
+    # via scippnexus
+six==1.16.0
+    # via python-dateutil

requirements/basetest.txt

@@ -13,7 +13,7 @@ packaging==23.2
     # via pytest
 pluggy==1.4.0
     # via pytest
-pytest==8.0.1
+pytest==8.0.2
     # via -r basetest.in
 tomli==2.0.1
     # via pytest

requirements/ci.txt

@@ -5,7 +5,7 @@
 #
 #    pip-compile-multi
 #
-cachetools==5.3.2
+cachetools==5.3.3
     # via tox
 certifi==2024.2.2
     # via requests

requirements/dev.txt

@@ -50,7 +50,7 @@ isoduration==20.11.0
     # via jsonschema
 jinja2-ansible-filters==1.3.2
     # via copier
-json5==0.9.17
+json5==0.9.20
     # via jupyterlab-server
 jsonpointer==2.4
     # via jsonschema
@@ -61,17 +61,17 @@ jsonschema[format-nongpl]==4.21.1
     #   nbformat
 jupyter-events==0.9.0
     # via jupyter-server
-jupyter-lsp==2.2.2
+jupyter-lsp==2.2.3
     # via jupyterlab
-jupyter-server==2.12.5
+jupyter-server==2.13.0
     # via
     #   jupyter-lsp
     #   jupyterlab
     #   jupyterlab-server
     #   notebook-shim
 jupyter-server-terminals==0.5.2
     # via jupyter-server
-jupyterlab==4.1.2
+jupyterlab==4.1.3
     # via -r dev.in
 jupyterlab-server==2.25.3
     # via jupyterlab
@@ -91,9 +91,9 @@ prometheus-client==0.20.0
     # via jupyter-server
 pycparser==2.21
     # via cffi
-pydantic==2.6.1
+pydantic==2.6.3
     # via copier
-pydantic-core==2.16.2
+pydantic-core==2.16.3
     # via pydantic
 python-json-logger==2.0.7
     # via jupyter-events
@@ -111,7 +111,7 @@ rfc3986-validator==0.1.1
     #   jupyter-events
 send2trash==1.8.2
     # via jupyter-server
-sniffio==1.3.0
+sniffio==1.3.1
     # via
     #   anyio
     #   httpx

requirements/docs.txt

@@ -54,9 +54,9 @@ idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
-ipykernel==6.29.2
+ipykernel==6.29.3
     # via -r docs.in
-ipython==8.22.0
+ipython==8.22.2
     # via
     #   -r docs.in
     #   ipykernel
@@ -107,7 +107,7 @@ myst-parser==2.0.0
     # via -r docs.in
 nbclient==0.9.0
     # via nbconvert
-nbconvert==7.16.1
+nbconvert==7.16.2
     # via nbsphinx
 nbformat==5.9.2
     # via
@@ -149,8 +149,6 @@ pygments==2.17.2
     #   nbconvert
     #   pydata-sphinx-theme
     #   sphinx
-python-dateutil==2.8.2
-    # via jupyter-client
 pyyaml==6.0.1
     # via myst-parser
 pyzmq==25.1.2
@@ -167,11 +165,6 @@ rpds-py==0.18.0
     # via
     #   jsonschema
     #   referencing
-six==1.16.0
-    # via
-    #   asttokens
-    #   bleach
-    #   python-dateutil
 snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.5
@@ -223,7 +216,7 @@ traitlets==5.14.1
     #   nbconvert
     #   nbformat
     #   nbsphinx
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via pydata-sphinx-theme
 urllib3==2.2.1
     # via requests

requirements/mypy.txt

@@ -10,5 +10,5 @@ mypy==1.8.0
     # via -r mypy.in
 mypy-extensions==1.0.0
     # via mypy
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via mypy

requirements/nightly.in

@@ -1,4 +1,5 @@
 -r basetest.in
 # --- END OF CUSTOM SECTION ---
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
-
+scipp >= 24.02.0
+scippnexus >= 24.03.0

requirements/nightly.txt

@@ -1,8 +1,27 @@
-# SHA1:e8b11c1210855f07eaedfbcfb3ecd1aec3595dee
+# SHA1:9bb7ade09fe2af7ab62c586f5f5dc6f3e9b8344b
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
 -r basetest.txt
+h5py==3.10.0
+    # via scippnexus
+numpy==1.26.4
+    # via
+    #   h5py
+    #   scipp
+    #   scipy
+python-dateutil==2.9.0.post0
+    # via scippnexus
+scipp==24.2.0
+    # via
+    #   -r nightly.in
+    #   scippnexus
+scippnexus==24.3.1
+    # via -r nightly.in
+scipy==1.12.0
+    # via scippnexus
+six==1.16.0
+    # via python-dateutil

requirements/wheels.txt

@@ -5,7 +5,7 @@
 #
 #    pip-compile-multi
 #
-build==1.0.3
+build==1.1.1
     # via -r wheels.in
 packaging==23.2
     # via build

src/ess/reduce/__init__.py

@@ -4,9 +4,13 @@
 # flake8: noqa
 import importlib.metadata
 
+from . import nexus
+
 try:
     __version__ = importlib.metadata.version(__package__ or __name__)
 except importlib.metadata.PackageNotFoundError:
     __version__ = "0.0.0"
 
 del importlib
+
+__all__ = ['nexus']

src/ess/reduce/logging.py

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
+
+"""Logging tools for ess.reduce."""
+
+import logging
+
+
+def get_logger() -> logging.Logger:
+    """Return the logger for ess.reduce.
+
+    Returns
+    -------
+    :
+        The requested logger.
+    """
+    return logging.getLogger('scipp.ess.reduce')