diff --git a/.copier-answers.ess.yml b/.copier-answers.ess.yml index d7d7e3b8..b5ea4085 100644 --- a/.copier-answers.ess.yml +++ b/.copier-answers.ess.yml @@ -1,3 +1,3 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 0951a4b +_commit: d1d5caa _src_path: https://github.com/scipp/ess_template diff --git a/.copier-answers.yml b/.copier-answers.yml index 667b34a8..4c28b3de 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -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: Diffraction data reduction for the European Spallation Source max_python: '3.13' diff --git a/.github/ISSUE_TEMPLATE/blank.md b/.github/ISSUE_TEMPLATE/blank.md deleted file mode 100644 index 22a75aeb..00000000 --- a/.github/ISSUE_TEMPLATE/blank.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: Blank -about: General issue that does not fit another category -title: '' -labels: '' -assignees: '' - ---- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4f913e71..77a6e9ca 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,14 +16,14 @@ 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.9 hooks: - id: ruff args: [ --fix ] @@ -31,7 +31,7 @@ repos: - 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: @@ -49,7 +49,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 diff --git a/docs/conf.py b/docs/conf.py index f2c70b48..1a5eb7c4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -275,9 +275,10 @@ def do_not_plot(*args, **kwargs): # Confluence requires login r"https?://confluence.ess.eu", # This returns '403 Forbidden' but the link works in a browser. - "https://doi.org/10.3233/JNR-220049", - # This returns '403 Forbidden' but the link works in a browser. "https://www.sciencedirect.com/science/article/pii/S2773183922000374", + # 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 bibtex --------------------------------------------------- diff --git a/docs/index.md b/docs/index.md index c20b767e..7e41e665 100644 --- a/docs/index.md +++ b/docs/index.md @@ -23,10 +23,10 @@ # {transparent}`ESSdiffraction` - +
Diffraction data reduction for the European Spallation Source

- +
## Quick links diff --git a/pyproject.toml b/pyproject.toml index bcd0510e..5f24425c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools>=68", + "setuptools>=77", "setuptools_scm[toml]>=8.0", ] build-backend = "setuptools.build_meta" @@ -9,11 +9,11 @@ build-backend = "setuptools.build_meta" name = "essdiffraction" description = "Diffraction 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", diff --git a/requirements/base.txt b/requirements/base.txt index 5c50f61f..c1f3c511 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,9 +1,9 @@ # SHA1:9fd92aa14a70d874a87640e7dbb332600b0c2ac7 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # annotated-types==0.7.0 # via pydantic @@ -132,7 +132,7 @@ pythreejs==2.4.2 # via -r base.in pyyaml==6.0.2 # via dask -sciline==25.5.0 +sciline==25.5.1 # via # -r base.in # essreduce diff --git a/requirements/basetest.txt b/requirements/basetest.txt index 29f84169..49f51f12 100644 --- a/requirements/basetest.txt +++ b/requirements/basetest.txt @@ -1,9 +1,9 @@ # SHA1:c4f3e9aaa3abd10fcdf497bea14415857f62cc89 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # certifi==2025.4.26 # via requests diff --git a/requirements/ci.txt b/requirements/ci.txt index 6c606423..5edeca3b 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,9 +1,9 @@ # SHA1:6344d52635ea11dca331a3bc6eb1833c4c64d585 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # cachetools==5.5.2 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 2dacc556..cf1a09f3 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,9 +1,9 @@ # SHA1:efd19a3a98c69fc3d6d6233ed855de7e4a208f74 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # -r base.txt -r ci.txt diff --git a/requirements/docs.txt b/requirements/docs.txt index 507fad62..8055a9d9 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,9 +1,9 @@ # SHA1:f334aa080c9558edc1a060050a0ddfab6eb8d408 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # -r base.txt accessible-pygments==0.0.5 diff --git a/requirements/mypy.txt b/requirements/mypy.txt index 77e99ca3..bba4ddd0 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -1,9 +1,9 @@ # SHA1:859ef9c15e5e57c6c91510133c01f5751feee941 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # -r test.txt mypy==1.15.0 diff --git a/requirements/nightly.txt b/requirements/nightly.txt index e78e93d1..20fb1b0e 100644 --- a/requirements/nightly.txt +++ b/requirements/nightly.txt @@ -1,9 +1,9 @@ # SHA1:366263fa92dc0eb9f81d46f056e0c80a931f671e # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # --index-url https://pypi.anaconda.org/scipp-nightly-wheels/simple/ --extra-index-url https://pypi.org/simple diff --git a/requirements/static.txt b/requirements/static.txt index 118b39ca..b2c56f97 100644 --- a/requirements/static.txt +++ b/requirements/static.txt @@ -1,9 +1,9 @@ # SHA1:5a0b1bb22ae805d8aebba0f3bf05ab91aceae0d8 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # cfgv==3.4.0 # via pre-commit diff --git a/requirements/test.txt b/requirements/test.txt index 3c7454d8..6817392e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,9 +1,9 @@ # SHA1:ef2ee9576d8a9e65b44e2865a26887eed3fc49d1 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # -r base.txt -r basetest.txt diff --git a/requirements/wheels.txt b/requirements/wheels.txt index 21d3cb06..651191e5 100644 --- a/requirements/wheels.txt +++ b/requirements/wheels.txt @@ -1,9 +1,9 @@ # SHA1:80754af91bfb6d1073585b046fe0a474ce868509 # -# This file is autogenerated by pip-compile-multi +# This file was generated by pip-compile-multi. # To update, run: # -# pip-compile-multi +# requirements upgrade # build==1.2.2.post1 # via -r wheels.in