Skip to content

Commit ee7ec6d

Browse files
authored
Merge branch 'main' into monitor-norm-nansum
2 parents a31cbed + 55b858d commit ee7ec6d

File tree

16 files changed

+110
-66
lines changed

16 files changed

+110
-66
lines changed

.github/workflows/nightly_at_main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ jobs:
3131
os-variant: ${{ matrix.os }}
3232
python-version: ${{ matrix.python.version }}
3333
tox-env: ${{ matrix.python.tox-env }}
34+
test-artifacts-name: 'essdiffraction-test-artifacts-latest'
3435
secrets: inherit

.github/workflows/nightly_at_release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ jobs:
3838
python-version: ${{ matrix.python.version }}
3939
tox-env: ${{ matrix.python.tox-env }}
4040
checkout_ref: ${{ needs.setup.outputs.release_tag }}
41+
test-artifacts-name: 'essdiffraction-test-artifacts-stable'
4142
secrets: inherit

.github/workflows/test.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ on:
2020
checkout_ref:
2121
default: ''
2222
type: string
23+
test-artifacts-name:
24+
default: ''
25+
type: string
2326
workflow_call:
2427
inputs:
2528
os-variant:
@@ -39,6 +42,9 @@ on:
3942
checkout_ref:
4043
default: ''
4144
type: string
45+
test-artifacts-name:
46+
default: ''
47+
type: string
4248

4349
jobs:
4450
package-test:
@@ -71,9 +77,14 @@ jobs:
7177
python-version: ${{ inputs.python-version }}
7278
- run: python -m pip install --upgrade pip
7379
- run: python -m pip install -r ${{ inputs.pip-recipe }}
74-
- run: tox -e ${{ inputs.tox-env }}
80+
- run: tox -e ${{ inputs.tox-env }} -- --file-output="tests_outputs"
7581
- uses: actions/upload-artifact@v4
7682
if: ${{ inputs.coverage-report }}
7783
with:
7884
name: CoverageReport
7985
path: coverage_html/
86+
- uses: actions/upload-artifact@v4
87+
if: ${{ inputs.test-artifacts-name != '' }}
88+
with:
89+
name: ${{ inputs.test-artifacts-name }}
90+
path: tests_outputs/

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies = [
3737
"numpy",
3838
"plopp>=25.03.0",
3939
"pythreejs",
40-
"sciline>=24.06.0",
40+
"sciline>=25.04.1",
4141
"scipp>=24.09.1",
4242
"scippneutron>=25.02.0",
4343
"scippnexus>=23.12.0",

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ graphviz
88
numpy
99
plopp>=25.03.0
1010
pythreejs
11-
sciline>=24.06.0
11+
sciline>=25.04.1
1212
scipp>=24.09.1
1313
scippneutron>=25.02.0
1414
scippnexus>=23.12.0

requirements/base.txt

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:af7d2d7a93f0ecc6c2914fa96f82f7aef8510e44
1+
# SHA1:4c637dd9c91e42089ff8f729de2279bb8611bf83
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -21,23 +21,23 @@ cyclebane==24.10.0
2121
# via sciline
2222
cycler==0.12.1
2323
# via matplotlib
24-
dask==2025.2.0
24+
dask==2025.3.0
2525
# via -r base.in
2626
decorator==5.2.1
2727
# via ipython
2828
dnspython==2.7.0
2929
# via email-validator
3030
email-validator==2.2.0
3131
# via scippneutron
32-
essreduce==25.3.0
32+
essreduce==25.4.1
3333
# via -r base.in
3434
exceptiongroup==1.2.2
3535
# via ipython
3636
executing==2.2.0
3737
# via stack-data
38-
fonttools==4.56.0
38+
fonttools==4.57.0
3939
# via matplotlib
40-
fsspec==2025.3.0
40+
fsspec==2025.3.2
4141
# via dask
4242
graphviz==0.20.3
4343
# via -r base.in
@@ -53,7 +53,7 @@ importlib-resources==6.5.2
5353
# via tof
5454
ipydatawidgets==4.3.5
5555
# via pythreejs
56-
ipython==8.34.0
56+
ipython==8.35.0
5757
# via ipywidgets
5858
ipywidgets==8.1.5
5959
# via
@@ -81,7 +81,7 @@ mpltoolbox==24.5.1
8181
# via scippneutron
8282
networkx==3.4.2
8383
# via cyclebane
84-
numpy==2.2.3
84+
numpy==2.2.4
8585
# via
8686
# -r base.in
8787
# contourpy
@@ -117,13 +117,13 @@ ptyprocess==0.7.0
117117
# via pexpect
118118
pure-eval==0.2.3
119119
# via stack-data
120-
pydantic==2.10.6
120+
pydantic==2.11.3
121121
# via scippneutron
122-
pydantic-core==2.27.2
122+
pydantic-core==2.33.1
123123
# via pydantic
124124
pygments==2.19.1
125125
# via ipython
126-
pyparsing==3.2.1
126+
pyparsing==3.2.3
127127
# via matplotlib
128128
python-dateutil==2.9.0.post0
129129
# via
@@ -134,7 +134,7 @@ pythreejs==2.4.2
134134
# via -r base.in
135135
pyyaml==6.0.2
136136
# via dask
137-
sciline==24.10.0
137+
sciline==25.4.1
138138
# via
139139
# -r base.in
140140
# essreduce
@@ -149,7 +149,7 @@ scippneutron==25.2.1
149149
# via
150150
# -r base.in
151151
# essreduce
152-
scippnexus==24.11.1
152+
scippnexus==25.4.0
153153
# via
154154
# -r base.in
155155
# essreduce
@@ -163,7 +163,7 @@ six==1.17.0
163163
# via python-dateutil
164164
stack-data==0.6.3
165165
# via ipython
166-
tof==25.2.0
166+
tof==25.4.0
167167
# via -r base.in
168168
toolz==1.0.0
169169
# via
@@ -179,11 +179,15 @@ traitlets==5.14.3
179179
# traittypes
180180
traittypes==0.2.1
181181
# via ipydatawidgets
182-
typing-extensions==4.12.2
182+
typing-extensions==4.13.1
183183
# via
184184
# ipython
185185
# pydantic
186186
# pydantic-core
187+
# sciline
188+
# typing-inspection
189+
typing-inspection==0.4.0
190+
# via pydantic
187191
wcwidth==0.2.13
188192
# via prompt-toolkit
189193
widgetsnbextension==4.0.13

requirements/basetest.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ exceptiongroup==1.2.2
1313
# via pytest
1414
idna==3.10
1515
# via requests
16-
iniconfig==2.0.0
16+
iniconfig==2.1.0
1717
# via pytest
18-
numpy==2.2.3
18+
numpy==2.2.4
1919
# via pandas
2020
packaging==24.2
2121
# via
2222
# pooch
2323
# pytest
2424
pandas==2.2.3
2525
# via -r basetest.in
26-
platformdirs==4.3.6
26+
platformdirs==4.3.7
2727
# via pooch
2828
pluggy==1.5.0
2929
# via pytest
@@ -33,15 +33,15 @@ pytest==8.3.5
3333
# via -r basetest.in
3434
python-dateutil==2.9.0.post0
3535
# via pandas
36-
pytz==2025.1
36+
pytz==2025.2
3737
# via pandas
3838
requests==2.32.3
3939
# via pooch
4040
six==1.17.0
4141
# via python-dateutil
4242
tomli==2.2.1
4343
# via pytest
44-
tzdata==2025.1
44+
tzdata==2025.2
4545
# via pandas
4646
urllib3==2.3.0
4747
# via requests

requirements/ci.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ colorama==0.4.6
1717
# via tox
1818
distlib==0.3.9
1919
# via virtualenv
20-
filelock==3.17.0
20+
filelock==3.18.0
2121
# via
2222
# tox
2323
# virtualenv
@@ -32,7 +32,7 @@ packaging==24.2
3232
# -r ci.in
3333
# pyproject-api
3434
# tox
35-
platformdirs==4.3.6
35+
platformdirs==4.3.7
3636
# via
3737
# tox
3838
# virtualenv
@@ -48,11 +48,11 @@ tomli==2.2.1
4848
# via
4949
# pyproject-api
5050
# tox
51-
tox==4.24.2
51+
tox==4.25.0
5252
# via -r ci.in
53-
typing-extensions==4.12.2
53+
typing-extensions==4.13.1
5454
# via tox
5555
urllib3==2.3.0
5656
# via requests
57-
virtualenv==20.29.3
57+
virtualenv==20.30.0
5858
# via tox

requirements/dev.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-r static.txt
1313
-r test.txt
1414
-r wheels.txt
15-
anyio==4.8.0
15+
anyio==4.9.0
1616
# via
1717
# httpx
1818
# jupyter-server
@@ -22,13 +22,13 @@ argon2-cffi-bindings==21.2.0
2222
# via argon2-cffi
2323
arrow==1.3.0
2424
# via isoduration
25-
async-lru==2.0.4
25+
async-lru==2.0.5
2626
# via jupyterlab
2727
cffi==1.17.1
2828
# via argon2-cffi-bindings
2929
copier==9.6.0
3030
# via -r dev.in
31-
dunamai==1.23.0
31+
dunamai==1.23.1
3232
# via copier
3333
fqdn==1.5.1
3434
# via jsonschema
@@ -44,7 +44,7 @@ isoduration==20.11.0
4444
# via jsonschema
4545
jinja2-ansible-filters==1.3.2
4646
# via copier
47-
json5==0.10.0
47+
json5==0.12.0
4848
# via jupyterlab-server
4949
jsonpointer==3.0.0
5050
# via jsonschema
@@ -65,7 +65,7 @@ jupyter-server==2.15.0
6565
# notebook-shim
6666
jupyter-server-terminals==0.5.3
6767
# via jupyter-server
68-
jupyterlab==4.3.5
68+
jupyterlab==4.4.0
6969
# via -r dev.in
7070
jupyterlab-server==2.27.3
7171
# via jupyterlab

requirements/docs.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ accessible-pygments==0.0.5
1010
# via pydata-sphinx-theme
1111
alabaster==1.0.0
1212
# via sphinx
13-
attrs==25.1.0
13+
attrs==25.3.0
1414
# via
1515
# jsonschema
1616
# referencing
@@ -85,7 +85,7 @@ mdit-py-plugins==0.4.2
8585
# via myst-parser
8686
mdurl==0.1.2
8787
# via markdown-it-py
88-
mistune==3.1.2
88+
mistune==3.1.3
8989
# via nbconvert
9090
myst-parser==4.0.1
9191
# via -r docs.in
@@ -106,7 +106,7 @@ pandas==2.2.3
106106
# via -r docs.in
107107
pandocfilters==1.5.1
108108
# via nbconvert
109-
platformdirs==4.3.6
109+
platformdirs==4.3.7
110110
# via
111111
# jupyter-core
112112
# pooch
@@ -124,9 +124,9 @@ pybtex-docutils==1.0.3
124124
# via sphinxcontrib-bibtex
125125
pydata-sphinx-theme==0.16.1
126126
# via -r docs.in
127-
pytz==2025.1
127+
pytz==2025.2
128128
# via pandas
129-
pyzmq==26.3.0
129+
pyzmq==26.4.0
130130
# via
131131
# ipykernel
132132
# jupyter-client
@@ -138,7 +138,7 @@ requests==2.32.3
138138
# via
139139
# pooch
140140
# sphinx
141-
rpds-py==0.23.1
141+
rpds-py==0.24.0
142142
# via
143143
# jsonschema
144144
# referencing
@@ -184,7 +184,7 @@ tornado==6.4.2
184184
# via
185185
# ipykernel
186186
# jupyter-client
187-
tzdata==2025.1
187+
tzdata==2025.2
188188
# via pandas
189189
urllib3==2.3.0
190190
# via requests

0 commit comments

Comments
 (0)