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: d3d4dc7
_commit: 3f79959
_src_path: gh:scipp/copier_template
description: Reflectometry data reduction for the European Spallation Source
max_python: '3.13'
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ repos:
args: [ --markdown-linebreak-ext=md ]
exclude: '\.svg'
- repo: https://github.com/kynan/nbstripout
rev: 0.7.1
rev: 0.8.1
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.8.0
rev: v0.11.8
hooks:
- id: ruff
args: [ --fix ]
types_or: [ python, pyi, jupyter ]
- id: ruff-format
types_or: [ python, pyi ]
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
additional_dependencies:
Expand All @@ -47,7 +47,7 @@ repos:
- id: rst-inline-touching-normal
- id: text-unicode-replacement-char
- repo: https://github.com/rhysd/actionlint
rev: v1.7.3
rev: v1.7.7
hooks:
- id: actionlint
# Disable because of false-positive SC2046
Expand Down
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.10
3 changes: 3 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@ def do_not_plot(*args, **kwargs):
linkcheck_ignore = [
# Specific lines in Github blobs cannot be found by linkcheck.
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/',
]

# -- Options for Matplotlib in notebooks ----------------------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

# {transparent}`ESSreflectometry`

<span style="font-size:1.2em;font-style:italic;color:var(--pst-color-text-muted)">
<div style="font-size:1.2em;font-style:italic;color:var(--pst-color-text-muted);text-align:center;">
Reflectometry data reduction for the European Spallation Source
</br></br>
</span>
</div>

## Overview

Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"setuptools>=68",
"setuptools>=77",
"setuptools_scm[toml]>=8.0",
]
build-backend = "setuptools.build_meta"
Expand All @@ -9,11 +9,11 @@ build-backend = "setuptools.build_meta"
name = "essreflectometry"
description = "Reflectometry data reduction for the European Spallation Source"
authors = [{ name = "Scipp contributors" }]
license = { file = "LICENSE" }
license = "BSD-3-Clause"
license-files = ["LICENSE"]
readme = "README.md"
classifiers = [
"Intended Audience :: Science/Research",
"License :: OSI Approved :: BSD License",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
Expand Down
8 changes: 4 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dnspython==2.7.0
# via email-validator
email-validator==2.2.0
# via scippneutron
essreduce==25.4.1
essreduce==25.5.0
# via -r base.in
fonttools==4.57.0
# via matplotlib
Expand All @@ -47,7 +47,7 @@ lazy-loader==0.4
# scippneutron
locket==1.0.0
# via partd
matplotlib==3.10.1
matplotlib==3.10.3
# via
# mpltoolbox
# plopp
Expand Down Expand Up @@ -110,7 +110,7 @@ scipp==25.5.0
# essreduce
# scippneutron
# scippnexus
scippneutron==25.2.1
scippneutron==25.5.0
# via
# -r base.in
# essreduce
Expand All @@ -119,7 +119,7 @@ scippnexus==25.4.0
# -r base.in
# essreduce
# scippneutron
scipy==1.15.2
scipy==1.15.3
# via
# scippneutron
# scippnexus
Expand Down
2 changes: 1 addition & 1 deletion requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ packaging==25.0
# via
# pooch
# pytest
platformdirs==4.3.7
platformdirs==4.3.8
# via pooch
pluggy==1.5.0
# via pytest
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ packaging==25.0
# -r ci.in
# pyproject-api
# tox
platformdirs==4.3.7
platformdirs==4.3.8
# via
# tox
# virtualenv
Expand All @@ -54,5 +54,5 @@ typing-extensions==4.13.2
# via tox
urllib3==2.4.0
# via requests
virtualenv==20.30.0
virtualenv==20.31.2
# via tox
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cffi==1.17.1
# via argon2-cffi-bindings
copier==9.7.1
# via -r dev.in
dunamai==1.23.1
dunamai==1.24.0
# via copier
fqdn==1.5.1
# via jsonschema
Expand Down Expand Up @@ -65,7 +65,7 @@ jupyter-server==2.15.0
# notebook-shim
jupyter-server-terminals==0.5.3
# via jupyter-server
jupyterlab==4.4.1
jupyterlab==4.4.2
# via -r dev.in
jupyterlab-server==2.27.3
# via jupyterlab
Expand Down
8 changes: 4 additions & 4 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ipython==8.36.0
# ipywidgets
ipytree==0.2.2
# via -r docs.in
ipywidgets==8.1.6
ipywidgets==8.1.7
# via
# -r docs.in
# bqplot
Expand Down Expand Up @@ -104,7 +104,7 @@ jupyter-core==5.7.2
# nbformat
jupyterlab-pygments==0.3.0
# via nbconvert
jupyterlab-widgets==3.0.14
jupyterlab-widgets==3.0.15
# via ipywidgets
markdown-it-py==3.0.0
# via
Expand Down Expand Up @@ -145,7 +145,7 @@ parso==0.8.4
# via jedi
pexpect==4.9.0
# via ipython
platformdirs==4.3.7
platformdirs==4.3.8
# via
# jupyter-core
# pooch
Expand Down Expand Up @@ -186,7 +186,7 @@ rpds-py==0.24.0
# via
# jsonschema
# referencing
snowballstemmer==2.2.0
snowballstemmer==3.0.0.1
# via sphinx
soupsieve==2.7
# via beautifulsoup4
Expand Down
8 changes: 4 additions & 4 deletions requirements/nightly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dnspython==2.7.0
# via email-validator
email-validator==2.2.0
# via scippneutron
essreduce==25.4.1
essreduce==25.5.0
# via -r nightly.in
exceptiongroup==1.2.2
# via pytest
Expand Down Expand Up @@ -60,7 +60,7 @@ lazy-loader==0.4
# scippneutron
locket==1.0.0
# via partd
matplotlib==3.10.1
matplotlib==3.10.3
# via
# mpltoolbox
# plopp
Expand Down Expand Up @@ -92,7 +92,7 @@ partd==1.4.2
# via dask
pillow==11.2.1
# via matplotlib
platformdirs==4.3.7
platformdirs==4.3.8
# via pooch
plopp @ git+https://github.com/scipp/plopp@main
# via
Expand Down Expand Up @@ -144,7 +144,7 @@ scippnexus @ git+https://github.com/scipp/scippnexus@main
# -r nightly.in
# essreduce
# scippneutron
scipy==1.15.2
scipy==1.15.3
# via
# scippneutron
# scippnexus
Expand Down
4 changes: 2 additions & 2 deletions requirements/static.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ identify==2.6.10
# via pre-commit
nodeenv==1.9.1
# via pre-commit
platformdirs==4.3.7
platformdirs==4.3.8
# via virtualenv
pre-commit==4.2.0
# via -r static.in
pyyaml==6.0.2
# via pre-commit
virtualenv==20.30.0
virtualenv==20.31.2
# via pre-commit
6 changes: 3 additions & 3 deletions src/ess/offspec/conversions.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ def coordinate_transformation_graph_sample() -> CoordTransformationGraph[SampleR
}


def coordinate_transformation_graph_reference() -> (
CoordTransformationGraph[ReferenceRun]
):
def coordinate_transformation_graph_reference() -> CoordTransformationGraph[
ReferenceRun
]:
return {
**beamline.beamline(scatter=False),
**tof.elastic_wavelength("tof"),
Expand Down
3 changes: 1 addition & 2 deletions src/ess/reflectometry/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ def linlogspace(
num = [num]
if len(scale) != len(edges) - 1:
raise ValueError(
"Sizes do not match. The length of edges should be one "
"greater than scale."
"Sizes do not match. The length of edges should be one greater than scale."
)

funcs = {"linear": sc.linspace, "log": sc.geomspace}
Expand Down
Loading