Skip to content

Commit 8ffb6ae

Browse files
committed
Update to release Sciline, pin Numpy<2
1 parent 982f7b3 commit 8ffb6ae

11 files changed

+25
-14
lines changed

pyproject.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ dependencies = [
3333
"dask",
3434
"essreduce",
3535
"graphviz",
36+
"numpy<2.0.0",
3637
"plopp",
3738
"pythreejs",
38-
"sciline @ git+https://github.com/scipp/sciline@main",
39+
"sciline>=24.06.0",
3940
"scipp>=23.8.0",
4041
"scippneutron>=23.9.0",
4142
"scippnexus>=23.12.0",

requirements/base.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
dask
66
essreduce
77
graphviz
8+
numpy<2.0.0
89
plopp
910
pythreejs
10-
sciline @ git+https://github.com/scipp/sciline@main
11+
sciline>=24.06.0
1112
scipp>=23.8.0
1213
scippneutron>=23.9.0
1314
scippnexus>=23.12.0

requirements/base.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:c295043710d412bbe1d15aafd5a81fda493eb691
1+
# SHA1:4c50d46537635c6b5484ebc2993aec09597baf9c
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -23,7 +23,7 @@ cyclebane==24.6.0
2323
# via sciline
2424
cycler==0.12.1
2525
# via matplotlib
26-
dask==2024.5.2
26+
dask==2024.6.0
2727
# via -r base.in
2828
decorator==5.1.1
2929
# via ipython
@@ -71,6 +71,7 @@ networkx==3.3
7171
# via cyclebane
7272
numpy==1.26.4
7373
# via
74+
# -r base.in
7475
# contourpy
7576
# h5py
7677
# ipydatawidgets
@@ -120,7 +121,7 @@ pyyaml==6.0.1
120121
# via dask
121122
requests==2.32.3
122123
# via pooch
123-
sciline @ git+https://github.com/scipp/sciline@main
124+
sciline==24.6.0
124125
# via -r base.in
125126
scipp==24.5.1
126127
# via

requirements/basetest.in

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Dependencies that are only used by tests.
22
# Do not make an environment from this file, use test.txt instead!
33

4+
numpy<2.0.0
45
pandas
56
pytest

requirements/basetest.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:2da4cc17c82e9ac0b3764abd55420a1e9d217c9d
1+
# SHA1:1199eb6a71c82d0580b7a1a4178e0c3586ed7e67
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -10,7 +10,9 @@ exceptiongroup==1.2.1
1010
iniconfig==2.0.0
1111
# via pytest
1212
numpy==1.26.4
13-
# via pandas
13+
# via
14+
# -r basetest.in
15+
# pandas
1416
packaging==24.1
1517
# via pytest
1618
pandas==2.2.2

requirements/ci.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ colorama==0.4.6
1717
# via tox
1818
distlib==0.3.8
1919
# via virtualenv
20-
filelock==3.14.0
20+
filelock==3.15.1
2121
# via
2222
# tox
2323
# virtualenv

requirements/dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ prometheus-client==0.20.0
8787
# via jupyter-server
8888
pycparser==2.22
8989
# via cffi
90-
pydantic==2.7.3
90+
pydantic==2.7.4
9191
# via copier
9292
pydantic-core==2.18.4
9393
# via pydantic

requirements/docs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ docutils==0.21.2
3434
# nbsphinx
3535
# pydata-sphinx-theme
3636
# sphinx
37-
fastjsonschema==2.19.1
37+
fastjsonschema==2.20.0
3838
# via nbformat
3939
imagesize==1.4.1
4040
# via sphinx

requirements/nightly.in

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
dask
55
essreduce
66
graphviz
7+
numpy<2.0.0
78
pythreejs
89
https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
910
scippnexus @ git+https://github.com/scipp/scippnexus@main

requirements/nightly.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:16b2b3d983c096ba312d853cbfe99af3c40ea8c1
1+
# SHA1:0dfa2ef646a3cba3ffca95624ad8e0aa8e443190
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -24,7 +24,7 @@ cyclebane==24.6.0
2424
# via sciline
2525
cycler==0.12.1
2626
# via matplotlib
27-
dask==2024.5.2
27+
dask==2024.6.0
2828
# via -r nightly.in
2929
decorator==5.1.1
3030
# via ipython
@@ -63,9 +63,13 @@ kiwisolver==1.4.5
6363
locket==1.0.0
6464
# via partd
6565
matplotlib==3.9.0
66-
# via plopp
66+
# via
67+
# mpltoolbox
68+
# plopp
6769
matplotlib-inline==0.1.7
6870
# via ipython
71+
mpltoolbox==24.5.1
72+
# via scippneutron
6973
networkx==3.3
7074
# via cyclebane
7175
parso==0.8.4

requirements/static.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cfgv==3.4.0
99
# via pre-commit
1010
distlib==0.3.8
1111
# via virtualenv
12-
filelock==3.14.0
12+
filelock==3.15.1
1313
# via virtualenv
1414
identify==2.5.36
1515
# via pre-commit

0 commit comments

Comments
 (0)