Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: c3214e6
_commit: b87e087
_src_path: gh:scipp/copier_template
description: An h5py-like utility for NeXus files with seamless Scipp integration
max_python: '3.13'
Expand Down
13 changes: 0 additions & 13 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
path: html/
- run: echo "::notice::https://remote-unzip.deno.dev/${{ github.repository }}/artifacts/${{ steps.artifact-upload-step.outputs.artifact-id }}"

- uses: JamesIves/github-pages-deploy-action@v4.7.3
- uses: JamesIves/github-pages-deploy-action@v4.8.0
if: ${{ inputs.publish }}
with:
branch: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_at_main_lower_bound.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
with:
python-version: ${{ matrix.python.version }}
- run: uv run --extra=test --resolution=lowest-direct pytest
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ docs/generated/
*.zip
*.sqw
*.nxspe
*.mtz
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -15,14 +15,14 @@ repos:
args: [ --markdown-linebreak-ext=md ]
exclude: '\.svg'
- repo: https://github.com/kynan/nbstripout
rev: 0.8.1
rev: 0.8.2
hooks:
- id: nbstripout
types: [ "jupyter" ]
args: [ "--drop-empty-cells",
"--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.11.12
rev: v0.14.6
hooks:
- id: ruff
args: [ --fix ]
Expand All @@ -48,7 +48,7 @@ repos:
- id: rst-inline-touching-normal
- id: text-unicode-replacement-char
- repo: https://github.com/rhysd/actionlint
rev: v1.7.7
rev: v1.7.9
hooks:
- id: actionlint
# Disable because of false-positive SC2046
Expand Down
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,6 @@ def do_not_plot(*args, **kwargs):
r'https?://github\.com/.*?/blob/[a-f0-9]+/.+?#',
# Linkcheck seems to be denied access by some DOI resolvers.
# Since DOIs are supposed to be permanent, we don't need to check them.'
r'https://doi\.org/',
r'https?://doi\.org/',
r'https?://dx\.doi\.org/',
]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dynamic = ["version"]

[project.optional-dependencies]
test = [
"pytest>=7.0",
"pytest>=8.0",
]

[project.urls]
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
#
h5py==3.15.1
# via -r base.in
numpy==2.4.1
numpy==2.4.2
# via
# h5py
# scipp
# scipy
scipp==26.1.1
scipp==26.2.0
# via -r base.in
scipy==1.17.0
# via -r base.in
2 changes: 1 addition & 1 deletion requirements/basetest.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# will not be touched by ``make_base.py``
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
pytest>=7.0
pytest>=8.0
2 changes: 1 addition & 1 deletion requirements/basetest.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:8287decb8676bd4ad5934cc138073b38af537418
# SHA1:a183f2aaeff6c4f418995809266f8825553a276e
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# requirements upgrade
#
cachetools==6.2.6
cachetools==7.0.0
# via tox
certifi==2026.1.4
# via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ipython!=8.7.0 # Breaks syntax highlighting in Jupyter code cells.
myst-parser
nbsphinx
pydata-sphinx-theme>=0.14
sphinx
sphinx<9.0.0
sphinx-autodoc-typehints
sphinx-copybutton
sphinx-design
Expand Down
28 changes: 16 additions & 12 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:aa7b5bf4690dc2ba74dc15f7758a8235d44dff89
# SHA1:1b674fbf98bf395cc6ae7012706def6f370b6712
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand All @@ -12,6 +12,8 @@ alabaster==1.0.0
# via sphinx
annotated-types==0.7.0
# via pydantic
appnope==0.1.4
# via ipykernel
asttokens==3.0.1
# via stack-data
attrs==25.4.0
Expand All @@ -20,7 +22,7 @@ attrs==25.4.0
# referencing
autodoc-pydantic==2.2.0
# via -r docs.in
babel==2.17.0
babel==2.18.0
# via
# pydata-sphinx-theme
# sphinx
Expand All @@ -40,13 +42,13 @@ contourpy==1.3.3
# via matplotlib
cycler==0.12.1
# via matplotlib
debugpy==1.8.19
debugpy==1.8.20
# via ipykernel
decorator==5.2.1
# via ipython
defusedxml==0.7.1
# via nbconvert
docutils==0.22.4
docutils==0.21.2
# via
# myst-parser
# nbsphinx
Expand All @@ -64,7 +66,7 @@ imagesize==1.4.1
# via sphinx
ipykernel==7.1.0
# via -r docs.in
ipython==9.9.0
ipython==9.10.0
# via
# -r docs.in
# ipykernel
Expand Down Expand Up @@ -125,7 +127,7 @@ myst-parser==5.0.0
# via -r docs.in
nbclient==0.10.4
# via nbconvert
nbconvert==7.16.6
nbconvert==7.17.0
# via nbsphinx
nbformat==5.10.4
# via
Expand Down Expand Up @@ -156,13 +158,13 @@ platformdirs==4.5.1
# via
# jupyter-core
# pooch
plopp==25.11.0
plopp==26.2.0
# via -r docs.in
pooch==1.8.2
pooch==1.9.0
# via -r docs.in
prompt-toolkit==3.0.52
# via ipython
psutil==7.2.1
psutil==7.2.2
# via ipykernel
ptyprocess==0.7.0
# via pexpect
Expand Down Expand Up @@ -209,6 +211,8 @@ requests==2.32.5
# pooch
# sphinx
roman-numerals==4.1.0
# via roman-numerals-py
roman-numerals-py==4.1.0
# via sphinx
rpds-py==0.30.0
# via
Expand All @@ -220,7 +224,7 @@ snowballstemmer==3.0.1
# via sphinx
soupsieve==2.8.3
# via beautifulsoup4
sphinx==9.0.4
sphinx==8.2.3
# via
# -r docs.in
# autodoc-pydantic
Expand All @@ -230,7 +234,7 @@ sphinx==9.0.4
# sphinx-autodoc-typehints
# sphinx-copybutton
# sphinx-design
sphinx-autodoc-typehints==3.6.1
sphinx-autodoc-typehints==3.5.2
# via -r docs.in
sphinx-copybutton==0.5.2
# via -r docs.in
Expand Down Expand Up @@ -282,7 +286,7 @@ typing-inspection==0.4.2
# pydantic-settings
urllib3==2.6.3
# via requests
wcwidth==0.5.0
wcwidth==0.5.3
# via prompt-toolkit
webencodings==0.5.1
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/nightly.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
scipy>=1.10.0
h5py>=3.12
pytest>=7.0
pytest>=8.0
scipp
--index-url=https://pypi.anaconda.org/scipp-nightly-wheels/simple/
--extra-index-url=https://pypi.org/simple
Expand Down
6 changes: 3 additions & 3 deletions requirements/nightly.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:444b5ef2a2c9ff87685acd8b81ddfd4460e9687d
# SHA1:b30ab65358588446f6086cfdb6e24c31a02a7b4a
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand All @@ -12,7 +12,7 @@ h5py==3.15.1
# via -r nightly.in
iniconfig==2.3.0
# via pytest
numpy==2.4.1
numpy==2.4.2
# via
# h5py
# scipp
Expand All @@ -25,7 +25,7 @@ pygments==2.19.2
# via pytest
pytest==9.0.2
# via -r nightly.in
scipp==26.1.1
scipp==100.0.0.dev0
# via -r nightly.in
scipy==1.17.0
# via -r nightly.in
2 changes: 1 addition & 1 deletion src/scippnexus/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
# ruff: noqa: E402, F401, I
# ruff: noqa: RUF100, E402, F401, I

import importlib.metadata

Expand Down
4 changes: 3 additions & 1 deletion tests/file_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright (c) 2024 Scipp contributors (https://github.com/scipp)

import io
import re
from pathlib import Path

import h5py as h5
Expand Down Expand Up @@ -62,6 +63,7 @@ def test_file_from_h5py_group_does_not_allow_extra_args(tmp_path) -> None:
with h5.File('test.nxs', 'w', driver='core', backing_store=False) as h5_file:
snx.create_class(h5_file, 'entry', snx.NXentry)
with pytest.raises(
TypeError, match='Cannot provide both h5py.File and other arguments'
TypeError,
match=re.escape('Cannot provide both h5py.File and other arguments'),
):
snx.File(h5_file, 'r')
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ commands = pytest {posargs}
description = invoke sphinx-build to build the HTML docs
deps = -r requirements/docs.txt
allowlist_externals=find
commands = python -m sphinx -j2 -v -b html -d {toxworkdir}/docs_doctrees docs html
python -m sphinx -j2 -v -b doctest -d {toxworkdir}/docs_doctrees docs html
commands = python -m sphinx -W -j2 -v -b html -d {toxworkdir}/docs_doctrees docs html
python -m sphinx -W -j2 -v -b doctest -d {toxworkdir}/docs_doctrees -D nbsphinx_execute=never docs html
find html -type f -name "*.ipynb" -not -path "html/_sources/*" -delete

[testenv:releasedocs]
Expand All @@ -42,7 +42,7 @@ commands = {[testenv:docs]commands}
[testenv:linkcheck]
description = Run Sphinx linkcheck
deps = -r requirements/docs.txt
commands = python -m sphinx -j2 -v -b linkcheck -d {toxworkdir}/docs_doctrees docs html
commands = python -m sphinx -j2 -v -b linkcheck -d {toxworkdir}/docs_doctrees -D nbsphinx_execute=never docs html

[testenv:static]
description = Code formatting and static analysis
Expand Down
Loading