Skip to content

Commit 67f8740

Browse files
authored
Change matplotlib version to 3.9.4 (#366)
* Change matplotlib version to 3.9.4 Updated matplotlib version for compatibility with gammapy==2.0.1. * uv.lock * test with gammapy * no 3.14 (lalsuite incompatibility) * conditional env with py3.14 * upgrade lock * fix: download ontology in tests * don't yet test against py3.14 * fix test
1 parent db64623 commit 67f8740

8 files changed

Lines changed: 1882 additions & 1340 deletions

File tree

.github/workflows/python-package-live.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v4
2929
- name: Install uv and set the python version
30-
uses: astral-sh/setup-uv@v6
30+
uses: astral-sh/setup-uv@v8.0.0
3131
with:
32-
version: "0.9.9"
32+
version: "0.11.2"
3333
python-version: ${{ matrix.python-version }}
3434

3535
- name: Install the project

.github/workflows/python-package.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,20 @@ jobs:
2121
- uses: actions/checkout@v4
2222

2323
- name: Install uv and set the python version
24-
uses: astral-sh/setup-uv@v6
24+
uses: astral-sh/setup-uv@v8.0.0
2525
with:
26-
version: "0.9.9"
26+
version: "0.11.2"
2727
python-version: ${{ matrix.python-version }}
2828

2929
- name: Install the project
3030
run: |
31-
uv sync --locked --all-extras --dev
3231
curl -o tests/oda-ontology.ttl https://raw.githubusercontent.com/oda-hub/ontology/main/ontology.ttl
3332
33+
if [ "${{ matrix.python-version }}" == "3.14" ]; then
34+
uv sync --locked --dev # no lalsuite for 3.14
35+
else
36+
uv sync --locked --all-extras --dev
37+
fi
3438
- name: Lint with flake8
3539
run: |
3640
# stop the build if there are Python syntax errors or undefined names

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
- repo: https://github.com/astral-sh/uv-pre-commit
33
# uv version.
4-
rev: 0.9.9
4+
rev: 0.11.2
55
hooks:
66
- id: uv-lock
77
- id: uv-export

doc/requirements.txt

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ astropy==7.2.0 ; python_full_version >= '3.11'
1515
# astroquery
1616
# oda-api
1717
# pyvo
18-
astropy-iers-data==0.2026.2.23.0.48.33
18+
astropy-iers-data==0.2026.3.30.0.54.34
1919
# via astropy
2020
astroquery==0.4.11
2121
# via oda-api
22-
attrs==25.4.0
23-
# via jsonschema
22+
attrs==26.1.0
23+
# via
24+
# jsonschema
25+
# referencing
2426
babel==2.18.0
2527
# via sphinx
2628
backports-tarfile==1.2.0 ; python_full_version < '3.12'
@@ -34,13 +36,13 @@ bleach==6.3.0
3436
# via nbconvert
3537
bokeh==3.1.1
3638
# via oda-api
37-
certifi==2026.1.4
39+
certifi==2026.2.25
3840
# via requests
3941
cffi==2.0.0 ; (implementation_name == 'pypy' and platform_python_implementation == 'PyPy') or (implementation_name == 'pypy' and sys_platform != 'linux') or (platform_python_implementation != 'PyPy' and sys_platform == 'linux')
4042
# via
4143
# cryptography
4244
# pyzmq
43-
charset-normalizer==3.4.4
45+
charset-normalizer==3.4.6
4446
# via requests
4547
click==8.3.1
4648
# via oda-api
@@ -56,7 +58,7 @@ contourpy==1.3.3 ; python_full_version >= '3.11'
5658
# via
5759
# bokeh
5860
# matplotlib
59-
cryptography==46.0.5 ; sys_platform == 'linux'
61+
cryptography==46.0.6 ; sys_platform == 'linux'
6062
# via secretstorage
6163
cycler==0.12.1
6264
# via matplotlib
@@ -72,22 +74,22 @@ docutils==0.22.4 ; python_full_version >= '3.11'
7274
# sphinx
7375
fastjsonschema==2.21.2
7476
# via nbformat
75-
fonttools==4.61.1
77+
fonttools==4.62.1
7678
# via matplotlib
7779
furo==2025.12.19
7880
html5lib==1.1
7981
# via astroquery
8082
idna==3.11
8183
# via requests
82-
imagesize==1.4.1
84+
imagesize==2.0.0
8385
# via sphinx
84-
importlib-metadata==8.7.1 ; python_full_version < '3.12'
86+
importlib-metadata==9.0.0 ; python_full_version < '3.12'
8587
# via keyring
8688
isodate==0.7.2 ; python_full_version < '3.11'
8789
# via rdflib
8890
jaraco-classes==3.4.0
8991
# via keyring
90-
jaraco-context==6.1.0
92+
jaraco-context==6.1.2
9193
# via keyring
9294
jaraco-functools==4.4.0
9395
# via keyring
@@ -103,10 +105,12 @@ jinja2==3.1.6
103105
# sphinx
104106
json-tricks==3.17.3
105107
# via oda-api
106-
jsonschema==4.17.3
108+
jsonschema==4.26.0
107109
# via
108110
# nbformat
109111
# oda-api
112+
jsonschema-specifications==2025.9.1
113+
# via jsonschema
110114
jupyter-client==8.8.0
111115
# via nbclient
112116
jupyter-core==5.9.1
@@ -119,13 +123,13 @@ jupyterlab-pygments==0.3.0
119123
# via nbconvert
120124
keyring==25.7.0
121125
# via astroquery
122-
kiwisolver==1.4.9
126+
kiwisolver==1.5.0
123127
# via matplotlib
124128
markupsafe==3.0.3
125129
# via
126130
# jinja2
127131
# nbconvert
128-
matplotlib==3.10.8
132+
matplotlib==3.9.4
129133
# via oda-api
130134
mistune==3.2.0
131135
# via nbconvert
@@ -154,7 +158,7 @@ numpy==1.26.4 ; python_full_version < '3.11'
154158
# pandas
155159
# pyerfa
156160
# scipy
157-
numpy==2.4.2 ; python_full_version >= '3.11'
161+
numpy==2.4.4 ; python_full_version >= '3.11'
158162
# via
159163
# astropy
160164
# astroquery
@@ -176,44 +180,42 @@ packaging==26.0
176180
# sphinx-automodapi
177181
pandas==2.3.3 ; python_full_version < '3.11'
178182
# via bokeh
179-
pandas==3.0.1 ; python_full_version >= '3.11'
183+
pandas==3.0.2 ; python_full_version >= '3.11'
180184
# via bokeh
181185
pandocfilters==1.5.1
182186
# via nbconvert
183187
pillow==12.1.1
184188
# via
185189
# bokeh
186190
# matplotlib
187-
platformdirs==4.9.2
191+
platformdirs==4.9.4
188192
# via jupyter-core
189193
puremagic==1.30 ; python_full_version < '3.12'
190194
# via oda-api
191-
puremagic==2.0.0 ; python_full_version >= '3.12'
195+
puremagic==2.1.1 ; python_full_version >= '3.12'
192196
# via oda-api
193197
pycparser==3.0 ; (implementation_name == 'pypy' and platform_python_implementation == 'PyPy') or (implementation_name != 'PyPy' and platform_python_implementation != 'PyPy' and sys_platform == 'linux') or (implementation_name == 'pypy' and sys_platform != 'linux')
194198
# via cffi
195199
pyerfa==2.0.1.5
196200
# via astropy
197-
pygments==2.19.2
201+
pygments==2.20.0
198202
# via
199203
# accessible-pygments
200204
# furo
201205
# nbconvert
202206
# sphinx
203-
pyjwt==2.11.0
207+
pyjwt==2.12.1
204208
# via oda-api
205209
pyparsing==3.3.2
206210
# via
207211
# matplotlib
208212
# rdflib
209-
pyrsistent==0.20.0
210-
# via jsonschema
211213
python-dateutil==2.9.0.post0
212214
# via
213215
# jupyter-client
214216
# matplotlib
215217
# pandas
216-
pytz==2025.2 ; python_full_version < '3.11'
218+
pytz==2026.1.post1 ; python_full_version < '3.11'
217219
# via pandas
218220
pyvo==1.8.1
219221
# via astroquery
@@ -227,14 +229,22 @@ pyzmq==27.1.0
227229
# via jupyter-client
228230
rdflib==7.6.0
229231
# via oda-api
230-
requests==2.32.5
232+
referencing==0.37.0
233+
# via
234+
# jsonschema
235+
# jsonschema-specifications
236+
requests==2.33.1
231237
# via
232238
# astroquery
233239
# oda-api
234240
# pyvo
235241
# sphinx
236242
roman-numerals==4.1.0 ; python_full_version >= '3.11'
237243
# via sphinx
244+
rpds-py==0.30.0
245+
# via
246+
# jsonschema
247+
# referencing
238248
scipy==1.15.3 ; python_full_version < '3.11'
239249
# via oda-api
240250
scipy==1.17.1 ; python_full_version >= '3.11'
@@ -287,11 +297,11 @@ sphinxcontrib-serializinghtml==2.0.0
287297
# via sphinx
288298
tinycss2==1.4.0
289299
# via bleach
290-
tomli==2.4.0 ; python_full_version < '3.11'
300+
tomli==2.4.1 ; python_full_version < '3.11'
291301
# via
292302
# numpydoc
293303
# sphinx
294-
tornado==6.5.4
304+
tornado==6.5.5
295305
# via
296306
# bokeh
297307
# jupyter-client
@@ -308,6 +318,8 @@ typing-extensions==4.15.0
308318
# beautifulsoup4
309319
# cryptography
310320
# mistune
321+
# pyjwt
322+
# referencing
311323
tzdata==2025.3 ; python_full_version < '3.11' or sys_platform == 'emscripten' or sys_platform == 'win32'
312324
# via pandas
313325
urllib3==2.6.3
@@ -317,7 +329,7 @@ webencodings==0.5.1
317329
# bleach
318330
# html5lib
319331
# tinycss2
320-
xyzservices==2025.11.0
332+
xyzservices==2026.3.0
321333
# via bokeh
322334
zipp==3.23.0 ; python_full_version < '3.12'
323335
# via importlib-metadata

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies = [
2323
"requests",
2424
"astropy>=6.1",
2525
"json_tricks",
26-
"matplotlib>=3.10",
26+
"matplotlib>=3.9.4", # for compatibility with gammapy==2.0.1 (requires mpl<3.10)
2727
"bokeh>3.0,<3.2",
2828
"numpy>=2.0 ; python_full_version >= '3.11'",
2929
"numpy<2.0 ; python_full_version < '3.11'",
@@ -74,4 +74,7 @@ docs = [
7474
"numpydoc>=1.9.0",
7575
"sphinx-automodapi>=0.20.0",
7676
]
77+
gammapy = [
78+
"gammapy>=2.0.1,<3.0.0"
79+
]
7780

0 commit comments

Comments
 (0)