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
4 changes: 2 additions & 2 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: d3d4dc7
_commit: 7e41523
_src_path: gh:scipp/copier_template
description: A simple tool to create time-of-flight chopper cascade diagrams
max_python: '3.13'
min_python: '3.10'
min_python: '3.11'
namespace_package: ''
nightly_deps: scipp,plopp
orgname: scipp
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: 1 addition & 1 deletion .github/workflows/python-version-ci
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
3.11
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

upload_pypi:
name: Deploy PyPI
needs: build_wheels
needs: [build_wheels]
runs-on: 'ubuntu-24.04'
environment: release
permissions:
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: pypa/gh-action-pypi-publish@v1.12.4

docs:
needs: upload_pypi
needs: [upload_pypi]
uses: ./.github/workflows/docs.yml
with:
publish: ${{ github.event_name == 'release' && github.event.action == 'published' }}
Expand Down
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ repos:
- id: check-merge-conflict
- id: check-toml
- id: check-yaml
exclude: conda/meta.yaml
- id: detect-private-key
- id: trailing-whitespace
args: [ --markdown-linebreak-ext=md ]
Expand All @@ -36,6 +35,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
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
3.11
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

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

## License

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

## Citing Tof

Expand Down
7 changes: 6 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
'sphinx_autodoc_typehints',
'sphinx_copybutton',
'sphinx_design',
'sphinxcontrib.autodoc_pydantic',
'nbsphinx',
'myst_parser',
]
Expand Down Expand Up @@ -181,7 +182,7 @@
},
{
"name": "Conda",
"url": "https://anaconda.org/scipp/tof",
"url": "https://anaconda.org/conda-forge/tof",
"icon": "fa-custom fa-anaconda",
"type": "fontawesome",
},
Expand Down Expand Up @@ -266,4 +267,8 @@ 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/',
r'https?://dx\.doi\.org/',
]
2 changes: 1 addition & 1 deletion docs/developer/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or `
Run the tests using

```sh
tox -e py310
tox -e py311
```

(or just `tox` if you want to run all environments).
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}`Tof`

<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;">
A simple tool to create time-of-flight chopper cascade diagrams
</br></br>
</span>
</div>

## ✨ [Try it in your browser](https://scipp.github.io/toflite/lab/index.html?path=app.ipynb) ✨

Expand Down
12 changes: 7 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
[build-system]
requires = ["setuptools>=68", "setuptools_scm[toml]>=8.0"]
requires = [
"setuptools>=77",
"setuptools_scm[toml]>=8.0",
]
build-backend = "setuptools.build_meta"

[project]
name = "tof"
description = "A simple tool to create time-of-flight chopper cascade diagrams"
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",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
"Typing :: Typed",
]
requires-python = ">=3.10"
requires-python = ">=3.11"

# IMPORTANT:
# Run 'tox -e deps' after making changes here. This will update requirement files.
Expand Down
20 changes: 10 additions & 10 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
#
# requirements upgrade
#
contourpy==1.3.2
contourpy==1.3.3
# via matplotlib
cycler==0.12.1
# via matplotlib
fonttools==4.57.0
fonttools==4.60.1
# via matplotlib
kiwisolver==1.4.8
kiwisolver==1.4.9
# via matplotlib
lazy-loader==0.4
# via
# -r base.in
# plopp
matplotlib==3.10.1
matplotlib==3.10.6
# via plopp
numpy==2.2.5
numpy==2.3.3
# via
# contourpy
# matplotlib
Expand All @@ -29,17 +29,17 @@ packaging==25.0
# via
# lazy-loader
# matplotlib
pillow==11.2.1
pillow==11.3.0
# via matplotlib
plopp==25.4.1
plopp==25.9.0
# via -r base.in
pyparsing==3.2.3
pyparsing==3.2.5
# via matplotlib
python-dateutil==2.9.0.post0
# via matplotlib
scipp==25.5.1
scipp==25.8.0
# via -r base.in
scipy==1.15.2
scipy==1.16.2
# via -r base.in
six==1.17.0
# via python-dateutil
10 changes: 4 additions & 6 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
#
# requirements upgrade
#
exceptiongroup==1.2.2
# via pytest
iniconfig==2.1.0
# via pytest
packaging==25.0
# via pytest
pluggy==1.5.0
pluggy==1.6.0
# via pytest
pytest==8.3.5
# via -r basetest.in
tomli==2.2.1
pygments==2.19.2
# via pytest
pytest==8.4.2
# via -r basetest.in
32 changes: 13 additions & 19 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,47 @@
#
# requirements upgrade
#
cachetools==5.5.2
cachetools==6.2.0
# via tox
certifi==2025.4.26
certifi==2025.8.3
# via requests
chardet==5.2.0
# via tox
charset-normalizer==3.4.1
charset-normalizer==3.4.3
# via requests
colorama==0.4.6
# via tox
distlib==0.3.9
distlib==0.4.0
# via virtualenv
filelock==3.18.0
filelock==3.19.1
# via
# tox
# virtualenv
gitdb==4.0.12
# via gitpython
gitpython==3.1.44
gitpython==3.1.45
# via -r ci.in
idna==3.10
# via requests
packaging==25.0
# via
# pyproject-api
# tox
platformdirs==4.3.7
platformdirs==4.4.0
# via
# tox
# virtualenv
pluggy==1.5.0
pluggy==1.6.0
# via tox
pyproject-api==1.9.0
pyproject-api==1.9.1
# via tox
requests==2.32.3
requests==2.32.5
# via -r ci.in
smmap==5.0.2
# via gitdb
tomli==2.2.1
# via
# pyproject-api
# tox
tox==4.25.0
tox==4.30.3
# via -r ci.in
typing-extensions==4.13.2
# via tox
urllib3==2.4.0
urllib3==2.5.0
# via requests
virtualenv==20.30.0
virtualenv==20.34.0
# via tox
Loading
Loading