Skip to content

Commit 2b1d075

Browse files
authored
Merge pull request #10 from scipp/nexus-loaders
Generic NeXus loaders
2 parents 60bcb06 + 99a6a48 commit 2b1d075

17 files changed

+823
-27
lines changed

conda/meta.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ requirements:
1212
- setuptools_scm
1313
run:
1414
- python>=3.10
15+
- scipp >= 24.02.0
16+
- scippnexus >= 24.03.0
1517

1618
test:
1719
imports:

docs/api-reference/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@
2626
:toctree: ../generated/modules
2727
:template: module-template.rst
2828
:recursive:
29+
30+
nexus
2931
```

pyproject.toml

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ requires-python = ">=3.10"
3030
# Run 'tox -e deps' after making changes here. This will update requirement files.
3131
# Make sure to list one dependency per line.
3232
dependencies = [
33+
"scipp >= 24.02.0",
34+
"scippnexus >= 24.03.0",
3335
]
3436

3537
dynamic = ["version"]

requirements/base.in

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

requirements/base.txt

+20-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,26 @@
1-
# SHA1:da39a3ee5e6b4b0d3255bfef95601890afd80709
1+
# SHA1:b5fdb6600edc83ab95fb0e848607edef52cdd293
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
55
#
66
# pip-compile-multi
77
#
8-
8+
h5py==3.10.0
9+
# via scippnexus
10+
numpy==1.26.4
11+
# via
12+
# h5py
13+
# scipp
14+
# scipy
15+
python-dateutil==2.9.0.post0
16+
# via scippnexus
17+
scipp==24.2.0
18+
# via
19+
# -r base.in
20+
# scippnexus
21+
scippnexus==24.3.1
22+
# via -r base.in
23+
scipy==1.12.0
24+
# via scippnexus
25+
six==1.16.0
26+
# via python-dateutil

requirements/basetest.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packaging==23.2
1313
# via pytest
1414
pluggy==1.4.0
1515
# via pytest
16-
pytest==8.0.1
16+
pytest==8.0.2
1717
# via -r basetest.in
1818
tomli==2.0.1
1919
# via pytest

requirements/ci.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# pip-compile-multi
77
#
8-
cachetools==5.3.2
8+
cachetools==5.3.3
99
# via tox
1010
certifi==2024.2.2
1111
# via requests

requirements/dev.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ isoduration==20.11.0
5050
# via jsonschema
5151
jinja2-ansible-filters==1.3.2
5252
# via copier
53-
json5==0.9.17
53+
json5==0.9.20
5454
# via jupyterlab-server
5555
jsonpointer==2.4
5656
# via jsonschema
@@ -61,17 +61,17 @@ jsonschema[format-nongpl]==4.21.1
6161
# nbformat
6262
jupyter-events==0.9.0
6363
# via jupyter-server
64-
jupyter-lsp==2.2.2
64+
jupyter-lsp==2.2.3
6565
# via jupyterlab
66-
jupyter-server==2.12.5
66+
jupyter-server==2.13.0
6767
# via
6868
# jupyter-lsp
6969
# jupyterlab
7070
# jupyterlab-server
7171
# notebook-shim
7272
jupyter-server-terminals==0.5.2
7373
# via jupyter-server
74-
jupyterlab==4.1.2
74+
jupyterlab==4.1.3
7575
# via -r dev.in
7676
jupyterlab-server==2.25.3
7777
# via jupyterlab
@@ -91,9 +91,9 @@ prometheus-client==0.20.0
9191
# via jupyter-server
9292
pycparser==2.21
9393
# via cffi
94-
pydantic==2.6.1
94+
pydantic==2.6.3
9595
# via copier
96-
pydantic-core==2.16.2
96+
pydantic-core==2.16.3
9797
# via pydantic
9898
python-json-logger==2.0.7
9999
# via jupyter-events
@@ -111,7 +111,7 @@ rfc3986-validator==0.1.1
111111
# jupyter-events
112112
send2trash==1.8.2
113113
# via jupyter-server
114-
sniffio==1.3.0
114+
sniffio==1.3.1
115115
# via
116116
# anyio
117117
# httpx

requirements/docs.txt

+4-11
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ idna==3.6
5454
# via requests
5555
imagesize==1.4.1
5656
# via sphinx
57-
ipykernel==6.29.2
57+
ipykernel==6.29.3
5858
# via -r docs.in
59-
ipython==8.22.0
59+
ipython==8.22.2
6060
# via
6161
# -r docs.in
6262
# ipykernel
@@ -107,7 +107,7 @@ myst-parser==2.0.0
107107
# via -r docs.in
108108
nbclient==0.9.0
109109
# via nbconvert
110-
nbconvert==7.16.1
110+
nbconvert==7.16.2
111111
# via nbsphinx
112112
nbformat==5.9.2
113113
# via
@@ -149,8 +149,6 @@ pygments==2.17.2
149149
# nbconvert
150150
# pydata-sphinx-theme
151151
# sphinx
152-
python-dateutil==2.8.2
153-
# via jupyter-client
154152
pyyaml==6.0.1
155153
# via myst-parser
156154
pyzmq==25.1.2
@@ -167,11 +165,6 @@ rpds-py==0.18.0
167165
# via
168166
# jsonschema
169167
# referencing
170-
six==1.16.0
171-
# via
172-
# asttokens
173-
# bleach
174-
# python-dateutil
175168
snowballstemmer==2.2.0
176169
# via sphinx
177170
soupsieve==2.5
@@ -223,7 +216,7 @@ traitlets==5.14.1
223216
# nbconvert
224217
# nbformat
225218
# nbsphinx
226-
typing-extensions==4.9.0
219+
typing-extensions==4.10.0
227220
# via pydata-sphinx-theme
228221
urllib3==2.2.1
229222
# via requests

requirements/mypy.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ mypy==1.8.0
1010
# via -r mypy.in
1111
mypy-extensions==1.0.0
1212
# via mypy
13-
typing-extensions==4.9.0
13+
typing-extensions==4.10.0
1414
# via mypy

requirements/nightly.in

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

requirements/nightly.txt

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
1-
# SHA1:e8b11c1210855f07eaedfbcfb3ecd1aec3595dee
1+
# SHA1:9bb7ade09fe2af7ab62c586f5f5dc6f3e9b8344b
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
55
#
66
# pip-compile-multi
77
#
88
-r basetest.txt
9+
h5py==3.10.0
10+
# via scippnexus
11+
numpy==1.26.4
12+
# via
13+
# h5py
14+
# scipp
15+
# scipy
16+
python-dateutil==2.9.0.post0
17+
# via scippnexus
18+
scipp==24.2.0
19+
# via
20+
# -r nightly.in
21+
# scippnexus
22+
scippnexus==24.3.1
23+
# via -r nightly.in
24+
scipy==1.12.0
25+
# via scippnexus
26+
six==1.16.0
27+
# via python-dateutil

requirements/wheels.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# pip-compile-multi
77
#
8-
build==1.0.3
8+
build==1.1.1
99
# via -r wheels.in
1010
packaging==23.2
1111
# via build

src/ess/reduce/__init__.py

+4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
# flake8: noqa
55
import importlib.metadata
66

7+
from . import nexus
8+
79
try:
810
__version__ = importlib.metadata.version(__package__ or __name__)
911
except importlib.metadata.PackageNotFoundError:
1012
__version__ = "0.0.0"
1113

1214
del importlib
15+
16+
__all__ = ['nexus']

src/ess/reduce/logging.py

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)
3+
4+
"""Logging tools for ess.reduce."""
5+
6+
import logging
7+
8+
9+
def get_logger() -> logging.Logger:
10+
"""Return the logger for ess.reduce.
11+
12+
Returns
13+
-------
14+
:
15+
The requested logger.
16+
"""
17+
return logging.getLogger('scipp.ess.reduce')

0 commit comments

Comments
 (0)