Skip to content

Commit d3ba44b

Browse files
committed
deps: new sciline + tox deps
1 parent 0da806b commit d3ba44b

8 files changed

Lines changed: 26 additions & 27 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,10 @@ requires-python = ">=3.10"
3232
dependencies = [
3333
"dask",
3434
"graphviz",
35-
"numpy<2.0.0",
3635
"plopp",
3736
"sciline>=24.06.0",
3837
"scipp>=23.8.0",
39-
"scippnexus>=23.9.0",
38+
"scippnexus>=23.12.0",
4039
"pooch",
4140
"pandas",
4241
"gemmi",

requirements/base.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
55
dask
66
graphviz
7-
numpy<2.0.0
87
plopp
98
sciline>=24.06.0
109
scipp>=23.8.0
11-
scippnexus>=23.9.0
10+
scippnexus>=23.12.0
1211
pooch
1312
pandas
1413
gemmi

requirements/base.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:d990037ca721ab7b651343616ad51b7121679fd1
1+
# SHA1:bea70253436877e109e43f0839bf995cf4bbc84f
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -19,7 +19,7 @@ cyclebane==24.6.0
1919
# via sciline
2020
cycler==0.12.1
2121
# via matplotlib
22-
dask==2024.6.0
22+
dask==2024.6.2
2323
# via -r base.in
2424
defusedxml==0.7.1
2525
# via -r base.in
@@ -35,6 +35,8 @@ h5py==3.11.0
3535
# via scippnexus
3636
idna==3.7
3737
# via requests
38+
importlib-metadata==7.2.1
39+
# via dask
3840
kiwisolver==1.4.5
3941
# via matplotlib
4042
locket==1.0.0
@@ -43,9 +45,8 @@ matplotlib==3.9.0
4345
# via plopp
4446
networkx==3.3
4547
# via cyclebane
46-
numpy==1.26.4
48+
numpy==2.0.0
4749
# via
48-
# -r base.in
4950
# contourpy
5051
# h5py
5152
# matplotlib
@@ -65,7 +66,7 @@ pillow==10.3.0
6566
# via matplotlib
6667
platformdirs==4.2.2
6768
# via pooch
68-
plopp==24.5.0
69+
plopp==24.6.0
6970
# via -r base.in
7071
pooch==1.8.2
7172
# via -r base.in
@@ -82,13 +83,13 @@ pyyaml==6.0.1
8283
# via dask
8384
requests==2.32.3
8485
# via pooch
85-
sciline==24.6.0
86+
sciline==24.6.1
8687
# via -r base.in
8788
scipp==24.6.0
8889
# via
8990
# -r base.in
9091
# scippnexus
91-
scippnexus==24.3.1
92+
scippnexus==24.6.0
9293
# via -r base.in
9394
scipy==1.13.1
9495
# via scippnexus
@@ -100,5 +101,7 @@ toolz==0.12.1
100101
# partd
101102
tzdata==2024.1
102103
# via pandas
103-
urllib3==2.2.1
104+
urllib3==2.2.2
104105
# via requests
106+
zipp==3.19.2
107+
# via importlib-metadata

requirements/ci.txt

Lines changed: 4 additions & 4 deletions
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.15.1
20+
filelock==3.15.4
2121
# via
2222
# tox
2323
# virtualenv
@@ -38,7 +38,7 @@ platformdirs==4.2.2
3838
# virtualenv
3939
pluggy==1.5.0
4040
# via tox
41-
pyproject-api==1.6.1
41+
pyproject-api==1.7.1
4242
# via tox
4343
requests==2.32.3
4444
# via -r ci.in
@@ -50,7 +50,7 @@ tomli==2.0.1
5050
# tox
5151
tox==4.15.1
5252
# via -r ci.in
53-
urllib3==2.2.1
53+
urllib3==2.2.2
5454
# via requests
55-
virtualenv==20.26.2
55+
virtualenv==20.26.3
5656
# via tox

requirements/docs.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pexpect==4.9.0
129129
# via ipython
130130
prompt-toolkit==3.0.47
131131
# via ipython
132-
psutil==5.9.8
132+
psutil==6.0.0
133133
# via ipykernel
134134
ptyprocess==0.7.0
135135
# via pexpect
@@ -173,7 +173,7 @@ sphinx==7.3.7
173173
# sphinx-autodoc-typehints
174174
# sphinx-copybutton
175175
# sphinx-design
176-
sphinx-autodoc-typehints==2.1.1
176+
sphinx-autodoc-typehints==2.2.2
177177
# via -r docs.in
178178
sphinx-copybutton==0.5.2
179179
# via -r docs.in

requirements/nightly.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
44
dask
55
graphviz
6-
numpy<2.0.0
76
pooch
87
pandas
98
gemmi

requirements/nightly.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:cf810ac50e2bcd3c53242a4261e4ec4706454425
1+
# SHA1:38452d7c1b37c7bcf4e0819d4f3cfcbe168c62ad
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -20,7 +20,7 @@ cyclebane==24.6.0
2020
# via sciline
2121
cycler==0.12.1
2222
# via matplotlib
23-
dask==2024.6.0
23+
dask==2024.6.2
2424
# via -r nightly.in
2525
defusedxml==0.7.1
2626
# via -r nightly.in
@@ -36,7 +36,7 @@ h5py==3.11.0
3636
# via scippnexus
3737
idna==3.7
3838
# via requests
39-
importlib-metadata==7.1.0
39+
importlib-metadata==7.2.1
4040
# via dask
4141
kiwisolver==1.4.5
4242
# via matplotlib
@@ -46,9 +46,8 @@ matplotlib==3.9.0
4646
# via plopp
4747
networkx==3.3
4848
# via cyclebane
49-
numpy==1.26.4
49+
numpy==2.0.0
5050
# via
51-
# -r nightly.in
5251
# contourpy
5352
# h5py
5453
# matplotlib
@@ -98,7 +97,7 @@ toolz==0.12.1
9897
# partd
9998
tzdata==2024.1
10099
# via pandas
101-
urllib3==2.2.1
100+
urllib3==2.2.2
102101
# via requests
103102
zipp==3.19.2
104103
# via importlib-metadata

requirements/static.txt

Lines changed: 2 additions & 2 deletions
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.15.1
12+
filelock==3.15.4
1313
# via virtualenv
1414
identify==2.5.36
1515
# via pre-commit
@@ -21,5 +21,5 @@ pre-commit==3.7.1
2121
# via -r static.in
2222
pyyaml==6.0.1
2323
# via pre-commit
24-
virtualenv==20.26.2
24+
virtualenv==20.26.3
2525
# via pre-commit

0 commit comments

Comments
 (0)