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: 3f79959
_commit: 3561fcd
_src_path: gh:scipp/copier_template
description: Reflectometry data reduction for the European Spallation Source
max_python: '3.13'
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/nightly_at_main_lower_bound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Nightly test using lower bound dependencies

on:
workflow_dispatch:
schedule:
- cron: '30 1 * * 1-5'

jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-24.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
steps:
- uses: actions/checkout@v4
- name: Get Python version for other CI jobs
id: vars
run: echo "min_python=$(< .github/workflows/python-version-ci)" >> "$GITHUB_OUTPUT"

tests:
name: Tests at lower bound
needs: setup
strategy:
matrix:
os: ['ubuntu-24.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
runs-on: ${{ matrix.os }}
env:
ESS_PROTECTED_FILESTORE_USERNAME: ${{ secrets.ESS_PROTECTED_FILESTORE_USERNAME }}
ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v6
with:
python-version: ${{ matrix.python.version }}
- run: uv run --extra=test --resolution=lowest-direct pytest
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ repos:
- id: codespell
additional_dependencies:
- tomli
exclude_types:
- svg
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.10.0
hooks:
Expand Down
4 changes: 2 additions & 2 deletions docs/about/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

## Development

ESSreflectometry is an open source project by the [European Spallation Source ERIC](https://europeanspallationsource.se/) (ESS).
ESSreflectometry is an open source project by the [European Spallation Source ERIC](https://ess.eu/) (ESS).

## License

ESSreflectometry is available as open source under the [BSD-3 license](https://opensource.org/licenses/BSD-3-Clause).
ESSreflectometry is available as open source under the [BSD-3 license](https://opensource.org/license/BSD-3-Clause).

## Citing ESSreflectometry

Expand Down
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
'sphinx_autodoc_typehints',
'sphinx_copybutton',
'sphinx_design',
"sphinxcontrib.bibtex",
'sphinxcontrib.bibtex',
'sphinxcontrib.autodoc_pydantic',
'nbsphinx',
'myst_parser',
]
Expand Down
16 changes: 8 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@ 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 = [
"dask",
"dask>=2022.1.0",
"python-dateutil",
"graphviz",
"plopp",
"orsopy",
"plopp>=24.7.0",
"orsopy>=1.2",
"sciline>=24.6.0",
"scipp>=24.09.1", # Fixed new hist/bin API
"scippneutron>=24.7.0",
"scippneutron>=24.10.0",
"scippnexus>=24.9.1",
"essreduce",
"pandas",
"essreduce>=25.4.0",
"pandas>=2.1.2",
]

dynamic = ["version"]

[project.optional-dependencies]
test = [
"pytest",
"pooch",
"pytest>=7.0",
"pooch>=1.5",
]
all = [
"ipywidgets",
Expand Down
12 changes: 6 additions & 6 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# will not be touched by ``make_base.py``
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
dask>=2022.1.0
python-dateutil
graphviz
plopp
orsopy
plopp>=24.7.0
orsopy>=1.2
sciline>=24.6.0
scipp>=24.09.1
scippneutron>=24.7.0
scippneutron>=24.10.0
scippnexus>=24.9.1
essreduce
pandas
essreduce>=25.4.0
pandas>=2.1.2
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:e1f1193e2c78c1dda6ffc784197fb6babbad9245
# SHA1:130d28f27af16c0c6e122d19bb76f37750334d26
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand Down Expand Up @@ -77,7 +77,7 @@ partd==1.4.2
# via dask
pillow==11.3.0
# via matplotlib
plopp==25.7.0
plopp==25.7.1
# via
# -r base.in
# scippneutron
Expand Down
4 changes: 2 additions & 2 deletions requirements/basetest.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,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!
pytest
pooch
pytest>=7.0
pooch>=1.5
2 changes: 1 addition & 1 deletion requirements/basetest.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:54ed0e3deb2d458e91bae14067e84eaad659f5fd
# SHA1:ca39ad2dd07c303d616b3b63afee59b3c41e83fe
#
# 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 @@ -15,7 +15,7 @@ charset-normalizer==3.4.2
# via requests
colorama==0.4.6
# via tox
distlib==0.3.9
distlib==0.4.0
# via virtualenv
filelock==3.18.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ json5==0.12.0
# via jupyterlab-server
jsonpointer==3.0.0
# via jsonschema
jsonschema[format-nongpl]==4.24.0
jsonschema[format-nongpl]==4.24.1
# via
# jupyter-events
# jupyterlab-server
Expand Down
1 change: 1 addition & 0 deletions requirements/docs.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
-r base.in
autodoc-pydantic
ipykernel
ipython!=8.7.0 # Breaks syntax highlighting in Jupyter code cells.
myst-parser
Expand Down
11 changes: 9 additions & 2 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:115367bb8120d51de5386764a1bfb682e35fb591
# SHA1:f9a72007a97d079a7753508dd281cc73be31c115
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand All @@ -16,6 +16,8 @@ attrs==25.3.0
# via
# jsonschema
# referencing
autodoc-pydantic==2.2.0
# via -r docs.in
babel==2.17.0
# via
# pydata-sphinx-theme
Expand Down Expand Up @@ -89,7 +91,7 @@ jinja2==3.1.6
# nbconvert
# nbsphinx
# sphinx
jsonschema==4.24.0
jsonschema==4.24.1
# via nbformat
jsonschema-specifications==2025.4.1
# via jsonschema
Expand Down Expand Up @@ -171,6 +173,8 @@ pybtex==0.25.1
# sphinxcontrib-bibtex
pybtex-docutils==1.0.3
# via sphinxcontrib-bibtex
pydantic-settings==2.10.1
# via autodoc-pydantic
pydata-sphinx-theme==0.16.1
# via -r docs.in
pygments==2.19.2
Expand All @@ -180,6 +184,8 @@ pygments==2.19.2
# nbconvert
# pydata-sphinx-theme
# sphinx
python-dotenv==1.1.1
# via pydantic-settings
pyzmq==27.0.0
# via
# ipykernel
Expand All @@ -203,6 +209,7 @@ soupsieve==2.7
sphinx==8.1.3
# via
# -r docs.in
# autodoc-pydantic
# myst-parser
# nbsphinx
# pydata-sphinx-theme
Expand Down
12 changes: 6 additions & 6 deletions requirements/nightly.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
dask>=2022.1.0
python-dateutil
graphviz
orsopy
essreduce
pandas
pytest
pooch
orsopy>=1.2
essreduce>=25.4.0
pandas>=2.1.2
pytest>=7.0
pooch>=1.5
plopp @ git+https://github.com/scipp/plopp@main
sciline @ git+https://github.com/scipp/sciline@main
scippneutron @ git+https://github.com/scipp/scippneutron@main
Expand Down
2 changes: 1 addition & 1 deletion requirements/nightly.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:1d5357c0111d56b227d417d6b9ca1c0de673c437
# SHA1:a521e061e365845bc9f865de42e02ae8ce9489b1
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand Down
2 changes: 1 addition & 1 deletion requirements/static.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
cfgv==3.4.0
# via pre-commit
distlib==0.3.9
distlib==0.4.0
# via virtualenv
filelock==3.18.0
# via virtualenv
Expand Down
Loading