Skip to content

Commit f112e75

Browse files
MridulSMridulS
authored
Merge pull request #189 from scipp/add-lower-pins
Add lower pins
2 parents 8d4d537 + b009d14 commit f112e75

File tree

11 files changed

+129
-42
lines changed

11 files changed

+129
-42
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: Diffraction 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

‎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-
ESSdiffraction is an open source project by the [European Spallation Source ERIC](https://europeanspallationsource.se/) (ESS).
5+
ESSdiffraction is an open source project by the [European Spallation Source ERIC](https://ess.eu/) (ESS).
66

77
## License
88

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

1111
## Citing ESSdiffraction
1212

‎docs/conf.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
html_show_sourcelink = True
2222

2323
extensions = [
24-
"sphinx.ext.autodoc",
25-
"sphinx.ext.autosummary",
26-
"sphinx.ext.doctest",
27-
"sphinx.ext.githubpages",
28-
"sphinx.ext.intersphinx",
29-
"sphinx.ext.mathjax",
30-
"sphinx.ext.napoleon",
31-
"sphinx.ext.viewcode",
32-
"sphinx_autodoc_typehints",
33-
"sphinx_copybutton",
34-
"sphinx_design",
35-
"sphinxcontrib.autodoc_pydantic",
36-
"sphinxcontrib.bibtex",
37-
"nbsphinx",
38-
"myst_parser",
24+
'sphinx.ext.autodoc',
25+
'sphinx.ext.autosummary',
26+
'sphinx.ext.doctest',
27+
'sphinx.ext.githubpages',
28+
'sphinx.ext.intersphinx',
29+
'sphinx.ext.mathjax',
30+
'sphinx.ext.napoleon',
31+
'sphinx.ext.viewcode',
32+
'sphinx_autodoc_typehints',
33+
'sphinx_copybutton',
34+
'sphinx_design',
35+
'sphinxcontrib.autodoc_pydantic',
36+
'sphinxcontrib.bibtex',
37+
'nbsphinx',
38+
'myst_parser',
3939
]
4040

4141
try:

‎pyproject.toml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ requires-python = ">=3.11"
3030
# Run 'tox -e deps' after making changes here. This will update requirement files.
3131
# Make sure to list one dependency per line.
3232
dependencies = [
33-
"dask",
33+
"dask>=2022.1.0",
3434
"essreduce>=25.07.0",
3535
"graphviz",
36-
"numpy",
37-
"plopp>=25.03.0",
38-
"pythreejs",
36+
"numpy>=1.25",
37+
"plopp>=25.07.0",
38+
"pythreejs>=2.4.1",
3939
"sciline>=25.04.1",
4040
"scipp>=25.05.1",
4141
"scippneutron>=25.02.0",
@@ -47,9 +47,10 @@ dynamic = ["version"]
4747

4848
[project.optional-dependencies]
4949
test = [
50-
"pandas",
51-
"pooch",
52-
"pytest",
50+
"pandas>=2.1.2",
51+
"pooch>=1.5",
52+
"pytest>=7.0",
53+
"ipywidgets>=8.1.7"
5354
]
5455

5556
[project.urls]

‎requirements/base.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
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
essreduce>=25.07.0
77
graphviz
8-
numpy
9-
plopp>=25.03.0
10-
pythreejs
8+
numpy>=1.25
9+
plopp>=25.07.0
10+
pythreejs>=2.4.1
1111
sciline>=25.04.1
1212
scipp>=25.05.1
1313
scippneutron>=25.02.0

‎requirements/base.txt‎

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

‎requirements/basetest.in‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
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-
pandas
11-
pooch
12-
pytest
10+
pandas>=2.1.2
11+
pooch>=1.5
12+
pytest>=7.0
13+
ipywidgets>=8.1.7

‎requirements/basetest.txt‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
1-
# SHA1:c4f3e9aaa3abd10fcdf497bea14415857f62cc89
1+
# SHA1:7f34665dae8380142bc93ee5745242a803a4e60c
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
66
# requirements upgrade
77
#
8+
asttokens==3.0.0
9+
# via stack-data
810
certifi==2025.8.3
911
# via requests
1012
charset-normalizer==3.4.2
1113
# via requests
14+
comm==0.2.3
15+
# via ipywidgets
16+
decorator==5.2.1
17+
# via ipython
18+
executing==2.2.0
19+
# via stack-data
1220
idna==3.10
1321
# via requests
1422
iniconfig==2.1.0
1523
# via pytest
24+
ipython==9.4.0
25+
# via ipywidgets
26+
ipython-pygments-lexers==1.1.1
27+
# via ipython
28+
ipywidgets==8.1.7
29+
# via -r basetest.in
30+
jedi==0.19.2
31+
# via ipython
32+
jupyterlab-widgets==3.0.15
33+
# via ipywidgets
34+
matplotlib-inline==0.1.7
35+
# via ipython
1636
numpy==2.3.2
1737
# via pandas
1838
packaging==25.0
@@ -21,14 +41,27 @@ packaging==25.0
2141
# pytest
2242
pandas==2.3.1
2343
# via -r basetest.in
44+
parso==0.8.4
45+
# via jedi
46+
pexpect==4.9.0
47+
# via ipython
2448
platformdirs==4.3.8
2549
# via pooch
2650
pluggy==1.6.0
2751
# via pytest
2852
pooch==1.8.2
2953
# via -r basetest.in
54+
prompt-toolkit==3.0.51
55+
# via ipython
56+
ptyprocess==0.7.0
57+
# via pexpect
58+
pure-eval==0.2.3
59+
# via stack-data
3060
pygments==2.19.2
31-
# via pytest
61+
# via
62+
# ipython
63+
# ipython-pygments-lexers
64+
# pytest
3265
pytest==8.4.1
3366
# via -r basetest.in
3467
python-dateutil==2.9.0.post0
@@ -39,7 +72,20 @@ requests==2.32.4
3972
# via pooch
4073
six==1.17.0
4174
# via python-dateutil
75+
stack-data==0.6.3
76+
# via ipython
77+
traitlets==5.14.3
78+
# via
79+
# ipython
80+
# ipywidgets
81+
# matplotlib-inline
82+
typing-extensions==4.14.1
83+
# via ipython
4284
tzdata==2025.2
4385
# via pandas
4486
urllib3==2.5.0
4587
# via requests
88+
wcwidth==0.2.13
89+
# via prompt-toolkit
90+
widgetsnbextension==4.0.14
91+
# via ipywidgets

‎requirements/nightly.in‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11

22
# --- END OF CUSTOM SECTION ---
33
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
4-
dask
4+
dask>=2022.1.0
55
graphviz
6-
numpy
7-
pythreejs
8-
pandas
9-
pooch
10-
pytest
6+
numpy>=1.25
7+
pythreejs>=2.4.1
8+
pandas>=2.1.2
9+
pooch>=1.5
10+
pytest>=7.0
11+
ipywidgets>=8.1.7
1112
scipp
1213
--index-url=https://pypi.anaconda.org/scipp-nightly-wheels/simple/
1314
--extra-index-url=https://pypi.org/simple

0 commit comments

Comments
 (0)