Skip to content

Commit 6f97593

Browse files
jokasimrjokasimr
authored
Merge pull request #167 from scipp/copier-update
Copier update + lower pins
2 parents 10d6c2f + 4662e45 commit 6f97593

File tree

17 files changed

+83
-35
lines changed

17 files changed

+83
-35
lines changed

‎.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: 3f79959
2+
_commit: 3561fcd
33
_src_path: gh:scipp/copier_template
44
description: Reflectometry data reduction for the European Spallation Source
55
max_python: '3.13'

‎.github/workflows/nightly_at_main_lower_bound.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Nightly test using lower bound dependencies
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '30 1 * * 1-5'
7+
8+
jobs:
9+
setup:
10+
name: Setup variables
11+
runs-on: 'ubuntu-24.04'
12+
outputs:
13+
min_python: ${{ steps.vars.outputs.min_python }}
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Get Python version for other CI jobs
17+
id: vars
18+
run: echo "min_python=$(< .github/workflows/python-version-ci)" >> "$GITHUB_OUTPUT"
19+
20+
tests:
21+
name: Tests at lower bound
22+
needs: setup
23+
strategy:
24+
matrix:
25+
os: ['ubuntu-24.04']
26+
python:
27+
- version: '${{needs.setup.outputs.min_python}}'
28+
runs-on: ${{ matrix.os }}
29+
env:
30+
ESS_PROTECTED_FILESTORE_USERNAME: ${{ secrets.ESS_PROTECTED_FILESTORE_USERNAME }}
31+
ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}
32+
steps:
33+
- uses: actions/checkout@v4
34+
- uses: astral-sh/setup-uv@v6
35+
with:
36+
python-version: ${{ matrix.python.version }}
37+
- run: uv run --extra=test --resolution=lowest-direct pytest

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ repos:
3636
- id: codespell
3737
additional_dependencies:
3838
- tomli
39+
exclude_types:
40+
- svg
3941
- repo: https://github.com/pre-commit/pygrep-hooks
4042
rev: v1.10.0
4143
hooks:

‎docs/about/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## Development
44

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

77
## License
88

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

1111
## Citing ESSreflectometry
1212

‎docs/conf.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
'sphinx_autodoc_typehints',
3333
'sphinx_copybutton',
3434
'sphinx_design',
35-
"sphinxcontrib.bibtex",
35+
'sphinxcontrib.bibtex',
36+
'sphinxcontrib.autodoc_pydantic',
3637
'nbsphinx',
3738
'myst_parser',
3839
]

‎pyproject.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,25 @@ requires-python = ">=3.10"
3131
# Run 'tox -e deps' after making changes here. This will update requirement files.
3232
# Make sure to list one dependency per line.
3333
dependencies = [
34-
"dask",
34+
"dask>=2022.1.0",
3535
"python-dateutil",
3636
"graphviz",
37-
"plopp",
38-
"orsopy",
37+
"plopp>=24.7.0",
38+
"orsopy>=1.2",
3939
"sciline>=24.6.0",
4040
"scipp>=24.09.1", # Fixed new hist/bin API
41-
"scippneutron>=24.7.0",
41+
"scippneutron>=24.10.0",
4242
"scippnexus>=24.9.1",
43-
"essreduce",
44-
"pandas",
43+
"essreduce>=25.4.0",
44+
"pandas>=2.1.2",
4545
]
4646

4747
dynamic = ["version"]
4848

4949
[project.optional-dependencies]
5050
test = [
51-
"pytest",
52-
"pooch",
51+
"pytest>=7.0",
52+
"pooch>=1.5",
5353
]
5454
all = [
5555
"ipywidgets",

‎requirements/base.in‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# will not be touched by ``make_base.py``
33
# --- END OF CUSTOM SECTION ---
44
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
5-
dask
5+
dask>=2022.1.0
66
python-dateutil
77
graphviz
8-
plopp
9-
orsopy
8+
plopp>=24.7.0
9+
orsopy>=1.2
1010
sciline>=24.6.0
1111
scipp>=24.09.1
12-
scippneutron>=24.7.0
12+
scippneutron>=24.10.0
1313
scippnexus>=24.9.1
14-
essreduce
15-
pandas
14+
essreduce>=25.4.0
15+
pandas>=2.1.2

‎requirements/base.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:e1f1193e2c78c1dda6ffc784197fb6babbad9245
1+
# SHA1:130d28f27af16c0c6e122d19bb76f37750334d26
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -77,7 +77,7 @@ partd==1.4.2
7777
# via dask
7878
pillow==11.3.0
7979
# via matplotlib
80-
plopp==25.7.0
80+
plopp==25.7.1
8181
# via
8282
# -r base.in
8383
# scippneutron

‎requirements/basetest.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
# will not be touched by ``make_base.py``
88
# --- END OF CUSTOM SECTION ---
99
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
10-
pytest
11-
pooch
10+
pytest>=7.0
11+
pooch>=1.5

‎requirements/basetest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:54ed0e3deb2d458e91bae14067e84eaad659f5fd
1+
# SHA1:ca39ad2dd07c303d616b3b63afee59b3c41e83fe
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:

0 commit comments

Comments
 (0)