Skip to content

Commit d6b516c

Browse files
jl-wynenjl-wynen
authored
Merge pull request #164 from scipp/copier-update
Copier and dependency update
2 parents c4aefdc + 0990328 commit d6b516c

File tree

17 files changed

+35
-42
lines changed

17 files changed

+35
-42
lines changed

‎.copier-answers.ess.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: 0951a4b
2+
_commit: d1d5caa
33
_src_path: https://github.com/scipp/ess_template

‎.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: d3d4dc7
2+
_commit: 3f79959
33
_src_path: gh:scipp/copier_template
44
description: Diffraction data reduction for the European Spallation Source
55
max_python: '3.13'

‎.github/ISSUE_TEMPLATE/blank.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ repos:
1616
args: [ --markdown-linebreak-ext=md ]
1717
exclude: '\.svg'
1818
- repo: https://github.com/kynan/nbstripout
19-
rev: 0.7.1
19+
rev: 0.8.1
2020
hooks:
2121
- id: nbstripout
2222
types: [ "jupyter" ]
2323
args: [ "--drop-empty-cells",
2424
"--extra-keys 'metadata.language_info.version cell.metadata.jp-MarkdownHeadingCollapsed cell.metadata.pycharm'" ]
2525
- repo: https://github.com/astral-sh/ruff-pre-commit
26-
rev: v0.8.0
26+
rev: v0.11.9
2727
hooks:
2828
- id: ruff
2929
args: [ --fix ]
3030
types_or: [ python, pyi, jupyter ]
3131
- id: ruff-format
3232
types_or: [ python, pyi ]
3333
- repo: https://github.com/codespell-project/codespell
34-
rev: v2.3.0
34+
rev: v2.4.1
3535
hooks:
3636
- id: codespell
3737
additional_dependencies:
@@ -49,7 +49,7 @@ repos:
4949
- id: rst-inline-touching-normal
5050
- id: text-unicode-replacement-char
5151
- repo: https://github.com/rhysd/actionlint
52-
rev: v1.7.3
52+
rev: v1.7.7
5353
hooks:
5454
- id: actionlint
5555
# Disable because of false-positive SC2046

‎docs/conf.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,10 @@ def do_not_plot(*args, **kwargs):
275275
# Confluence requires login
276276
r"https?://confluence.ess.eu",
277277
# This returns '403 Forbidden' but the link works in a browser.
278-
"https://doi.org/10.3233/JNR-220049",
279-
# This returns '403 Forbidden' but the link works in a browser.
280278
"https://www.sciencedirect.com/science/article/pii/S2773183922000374",
279+
# Linkcheck seems to be denied access by some DOI resolvers.
280+
# Since DOIs are supposed to be permanent, we don't need to check them.'
281+
r'https://doi\.org/',
281282
]
282283

283284
# -- Options for bibtex ---------------------------------------------------

‎docs/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
# {transparent}`ESSdiffraction`
2525

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

3131
## Quick links
3232

‎pyproject.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"setuptools>=68",
3+
"setuptools>=77",
44
"setuptools_scm[toml]>=8.0",
55
]
66
build-backend = "setuptools.build_meta"
@@ -9,11 +9,11 @@ build-backend = "setuptools.build_meta"
99
name = "essdiffraction"
1010
description = "Diffraction data reduction for the European Spallation Source"
1111
authors = [{ name = "Scipp contributors" }]
12-
license = { file = "LICENSE" }
12+
license = "BSD-3-Clause"
13+
license-files = ["LICENSE"]
1314
readme = "README.md"
1415
classifiers = [
1516
"Intended Audience :: Science/Research",
16-
"License :: OSI Approved :: BSD License",
1717
"Natural Language :: English",
1818
"Operating System :: OS Independent",
1919
"Programming Language :: Python :: 3",

‎requirements/base.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SHA1:9fd92aa14a70d874a87640e7dbb332600b0c2ac7
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
annotated-types==0.7.0
99
# via pydantic
@@ -132,7 +132,7 @@ pythreejs==2.4.2
132132
# via -r base.in
133133
pyyaml==6.0.2
134134
# via dask
135-
sciline==25.5.0
135+
sciline==25.5.1
136136
# via
137137
# -r base.in
138138
# essreduce

‎requirements/basetest.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SHA1:c4f3e9aaa3abd10fcdf497bea14415857f62cc89
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
certifi==2025.4.26
99
# via requests

‎requirements/ci.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SHA1:6344d52635ea11dca331a3bc6eb1833c4c64d585
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
cachetools==5.5.2
99
# via tox

0 commit comments

Comments
 (0)