Skip to content

Commit 2b22e38

Browse files
committed
fix: setting lower bound of spglib
For some reason the lower bound in ncrystal is not picked up properly by uv. Might have to do with the dependency being optional, but not sure.
1 parent 1a0aa41 commit 2b22e38

File tree

11 files changed

+74
-63
lines changed

11 files changed

+74
-63
lines changed

pyproject.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ requires-python = ">=3.11"
3232
dependencies = [
3333
"dask>=2022.1.0",
3434
"essreduce>=25.12.1",
35-
"graphviz",
35+
"essreduce>=25.11.0",
36+
"graphviz>=0.20",
3637
"numpy>=1.25",
3738
"plopp>=25.07.0",
3839
"pythreejs>=2.4.1",
@@ -42,7 +43,10 @@ dependencies = [
4243
"scippnexus>=23.12.0",
4344
"tof>=25.11.1",
4445
"ncrystal[cif]>=4.1.0",
45-
"spglib!=2.7", # https://github.com/mctools/ncrystal/issues/320
46+
# For some reason the spglib lower bound
47+
# in ncrystal is not picked up by uv,
48+
# so it's repeated here.
49+
"spglib!=2.7,>=2.1", # https://github.com/mctools/ncrystal/issues/320
4650
]
4751

4852
dynamic = ["version"]

requirements/base.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
55
dask>=2022.1.0
66
essreduce>=25.12.1
7-
graphviz
7+
essreduce>=25.11.0
8+
graphviz>=0.20
89
numpy>=1.25
910
plopp>=25.07.0
1011
pythreejs>=2.4.1
1112
sciline>=25.04.1
12-
scipp>=25.05.1
13+
scipp>=25.11.0
1314
scippneutron>=25.02.0
1415
scippnexus>=23.12.0
1516
tof>=25.11.1
1617
ncrystal[cif]>=4.1.0
18+
spglib!=2.7,>=2.1

requirements/base.txt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:211d5471bcbe9da722143b751c4a5cb05f6e5be4
1+
# SHA1:9c368525af8f5625e6995c2622c272af6d2dbe59
22
#
33
# This file was generated by pip-compile-multi.
44
# To update, run:
@@ -7,11 +7,11 @@
77
#
88
annotated-types==0.7.0
99
# via pydantic
10-
ase==3.26.0
10+
ase==3.27.0
1111
# via ncrystal
1212
asttokens==3.0.1
1313
# via stack-data
14-
certifi==2025.11.12
14+
certifi==2026.1.4
1515
# via requests
1616
charset-normalizer==3.4.4
1717
# via requests
@@ -27,19 +27,19 @@ cyclebane==24.10.0
2727
# via sciline
2828
cycler==0.12.1
2929
# via matplotlib
30-
dask==2025.11.0
30+
dask==2025.12.0
3131
# via -r base.in
3232
decorator==5.2.1
3333
# via ipython
3434
dnspython==2.8.0
3535
# via email-validator
3636
email-validator==2.3.0
3737
# via scippneutron
38-
essreduce==25.12.1
38+
essreduce==26.1.0
3939
# via -r base.in
4040
executing==2.2.1
4141
# via stack-data
42-
fonttools==4.61.0
42+
fonttools==4.61.1
4343
# via matplotlib
4444
fsspec==2025.12.0
4545
# via dask
@@ -55,11 +55,11 @@ idna==3.11
5555
# via
5656
# email-validator
5757
# requests
58-
importlib-metadata==8.7.0
58+
importlib-metadata==8.7.1
5959
# via dask
6060
ipydatawidgets==4.3.5
6161
# via pythreejs
62-
ipython==9.8.0
62+
ipython==9.9.0
6363
# via ipywidgets
6464
ipython-pygments-lexers==1.1.1
6565
# via ipython
@@ -80,7 +80,7 @@ lazy-loader==0.4
8080
# tof
8181
locket==1.0.0
8282
# via partd
83-
matplotlib==3.10.7
83+
matplotlib==3.10.8
8484
# via
8585
# ase
8686
# mpltoolbox
@@ -97,7 +97,7 @@ ncrystal-python==4.2.10
9797
# via ncrystal
9898
networkx==3.6.1
9999
# via cyclebane
100-
numpy==2.3.5
100+
numpy==2.4.0
101101
# via
102102
# -r base.in
103103
# ase
@@ -123,7 +123,7 @@ partd==1.4.2
123123
# via dask
124124
pexpect==4.9.0
125125
# via ipython
126-
pillow==12.0.0
126+
pillow==12.1.0
127127
# via matplotlib
128128
platformdirs==4.5.1
129129
# via pooch
@@ -148,7 +148,7 @@ pygments==2.19.2
148148
# via
149149
# ipython
150150
# ipython-pygments-lexers
151-
pyparsing==3.2.5
151+
pyparsing==3.3.1
152152
# via matplotlib
153153
python-dateutil==2.9.0.post0
154154
# via
@@ -188,7 +188,9 @@ scipy==1.16.3
188188
six==1.17.0
189189
# via python-dateutil
190190
spglib==2.6.0
191-
# via ncrystal
191+
# via
192+
# -r base.in
193+
# ncrystal
192194
stack-data==0.6.3
193195
# via ipython
194196
tof==25.12.1
@@ -215,7 +217,7 @@ typing-extensions==4.15.0
215217
# typing-inspection
216218
typing-inspection==0.4.2
217219
# via pydantic
218-
urllib3==2.6.1
220+
urllib3==2.6.2
219221
# via requests
220222
wcwidth==0.2.14
221223
# via prompt-toolkit

requirements/basetest.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
asttokens==3.0.1
99
# via stack-data
10-
certifi==2025.11.12
10+
certifi==2026.1.4
1111
# via requests
1212
charset-normalizer==3.4.4
1313
# via requests
@@ -21,7 +21,7 @@ idna==3.11
2121
# via requests
2222
iniconfig==2.3.0
2323
# via pytest
24-
ipython==9.8.0
24+
ipython==9.9.0
2525
# via ipywidgets
2626
ipython-pygments-lexers==1.1.1
2727
# via ipython
@@ -33,7 +33,7 @@ jupyterlab-widgets==3.0.16
3333
# via ipywidgets
3434
matplotlib-inline==0.2.1
3535
# via ipython
36-
numpy==2.3.5
36+
numpy==2.4.0
3737
# via pandas
3838
packaging==25.0
3939
# via
@@ -81,9 +81,9 @@ traitlets==5.14.3
8181
# matplotlib-inline
8282
typing-extensions==4.15.0
8383
# via ipython
84-
tzdata==2025.2
84+
tzdata==2025.3
8585
# via pandas
86-
urllib3==2.6.1
86+
urllib3==2.6.2
8787
# via requests
8888
wcwidth==0.2.14
8989
# via prompt-toolkit

requirements/ci.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#
66
# requirements upgrade
77
#
8-
cachetools==6.2.2
8+
cachetools==6.2.4
99
# via tox
10-
certifi==2025.11.12
10+
certifi==2026.1.4
1111
# via requests
1212
chardet==5.2.0
1313
# via tox
@@ -17,13 +17,13 @@ colorama==0.4.6
1717
# via tox
1818
distlib==0.4.0
1919
# via virtualenv
20-
filelock==3.20.0
20+
filelock==3.20.2
2121
# via
2222
# tox
2323
# virtualenv
2424
gitdb==4.0.12
2525
# via gitpython
26-
gitpython==3.1.45
26+
gitpython==3.1.46
2727
# via -r ci.in
2828
idna==3.11
2929
# via requests
@@ -44,9 +44,9 @@ requests==2.32.5
4444
# via -r ci.in
4545
smmap==5.0.2
4646
# via gitdb
47-
tox==4.32.0
47+
tox==4.33.0
4848
# via -r ci.in
49-
urllib3==2.6.1
49+
urllib3==2.6.2
5050
# via requests
5151
virtualenv==20.35.4
5252
# via tox

requirements/dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ isoduration==20.11.0
4444
# via jsonschema
4545
jinja2-ansible-filters==1.3.2
4646
# via copier
47-
json5==0.12.1
47+
json5==0.13.0
4848
# via jupyterlab-server
4949
jsonpointer==3.0.0
5050
# via jsonschema
@@ -65,7 +65,7 @@ jupyter-server==2.17.0
6565
# notebook-shim
6666
jupyter-server-terminals==0.5.3
6767
# via jupyter-server
68-
jupyterlab==4.5.0
68+
jupyterlab==4.5.1
6969
# via -r dev.in
7070
jupyterlab-server==2.28.0
7171
# via jupyterlab
@@ -99,7 +99,7 @@ rfc3986-validator==0.1.1
9999
# jupyter-events
100100
rfc3987-syntax==1.1.0
101101
# via jsonschema
102-
send2trash==1.8.3
102+
send2trash==2.0.0
103103
# via jupyter-server
104104
terminado==0.18.1
105105
# via

requirements/docs.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ beautifulsoup4==4.14.3
2626
# pydata-sphinx-theme
2727
bleach[css]==6.3.0
2828
# via nbconvert
29-
debugpy==1.8.17
29+
debugpy==1.8.19
3030
# via ipykernel
3131
defusedxml==0.7.1
3232
# via nbconvert
@@ -83,11 +83,11 @@ mdit-py-plugins==0.5.0
8383
# via myst-parser
8484
mdurl==0.1.2
8585
# via markdown-it-py
86-
mistune==3.1.4
86+
mistune==3.2.0
8787
# via nbconvert
8888
myst-parser==4.0.1
8989
# via -r docs.in
90-
nbclient==0.10.2
90+
nbclient==0.10.4
9191
# via nbconvert
9292
nbconvert==7.16.6
9393
# via nbsphinx
@@ -104,7 +104,7 @@ pandas==2.3.3
104104
# via -r docs.in
105105
pandocfilters==1.5.1
106106
# via nbconvert
107-
psutil==7.1.3
107+
psutil==7.2.1
108108
# via ipykernel
109109
pyarrow==22.0.0
110110
# via -r docs.in
@@ -130,15 +130,17 @@ referencing==0.37.0
130130
# via
131131
# jsonschema
132132
# jsonschema-specifications
133-
roman-numerals-py==3.1.0
133+
roman-numerals==4.1.0
134+
# via roman-numerals-py
135+
roman-numerals-py==4.1.0
134136
# via sphinx
135137
rpds-py==0.30.0
136138
# via
137139
# jsonschema
138140
# referencing
139141
snowballstemmer==3.0.1
140142
# via sphinx
141-
soupsieve==2.8
143+
soupsieve==2.8.1
142144
# via beautifulsoup4
143145
sphinx==8.2.3
144146
# via
@@ -173,11 +175,11 @@ sphinxcontrib-serializinghtml==2.0.0
173175
# via sphinx
174176
tinycss2==1.4.0
175177
# via bleach
176-
tornado==6.5.2
178+
tornado==6.5.4
177179
# via
178180
# ipykernel
179181
# jupyter-client
180-
tzdata==2025.2
182+
tzdata==2025.3
181183
# via pandas
182184
webencodings==0.5.1
183185
# via

requirements/mypy.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# requirements upgrade
77
#
88
-r test.txt
9-
librt==0.7.3
9+
librt==0.7.7
1010
# via mypy
11-
mypy==1.19.0
11+
mypy==1.19.1
1212
# via -r mypy.in
1313
mypy-extensions==1.1.0
1414
# via mypy

requirements/nightly.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
# --- END OF CUSTOM SECTION ---
33
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
44
dask>=2022.1.0
5-
graphviz
5+
graphviz>=0.20
66
numpy>=1.25
77
pythreejs>=2.4.1
88
ncrystal[cif]>=4.1.0
9+
spglib!=2.7,>=2.1
910
pandas>=2.1.2
1011
pooch>=1.5
1112
pytest>=7.0

0 commit comments

Comments
 (0)