Skip to content

Commit 754a12c

Browse files
authored
Merge pull request #169 from csiro-coasts/python3.13
Bump minimum versions of dependencies
2 parents 57a4a6c + d7bb46c commit 754a12c

File tree

17 files changed

+592
-377
lines changed

17 files changed

+592
-377
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
workflow_dispatch:
1313

1414
env:
15-
python-version: "3.12"
15+
python-version: "3.13"
1616

1717
jobs:
1818
build:
@@ -65,12 +65,12 @@ jobs:
6565
strategy:
6666
fail-fast: false
6767
matrix:
68-
python-version: ["3.10", "3.11", "3.12"]
68+
python-version: ["3.11", "3.12", "3.13"]
6969
dependencies: ["pinned"]
7070
include:
71-
- python-version: "3.12"
71+
- python-version: "3.13"
7272
dependencies: "latest"
73-
- python-version: "3.10"
73+
- python-version: "3.11"
7474
dependencies: "minimum"
7575

7676

@@ -135,7 +135,7 @@ jobs:
135135
uses: actions/cache@v3
136136
with:
137137
path: '.mypy_cache'
138-
key: mypy-${{ runner.os }}-py${{ env.python-version }}-${{ hashFiles('requirements.txt') }}
138+
key: mypy-${{ runner.os }}-py${{ env.python-version }}-${{ hashFiles(format('continuous-integration/requirements-{0}.txt', env.python-version)) }}
139139

140140
- run: flake8 src/ tests/
141141
- run: isort --diff --check-only src/ tests/

continuous-integration/requirements-3.11.txt

Lines changed: 88 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2,100 +2,103 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --extra=testing --output-file=./continuous-integration/requirements-3.11.txt setup.cfg
5+
# pip-compile --extra=testing --output-file=./continuous-integration/requirements-3.11.txt --unsafe-package=emsarray pyproject.toml
66
#
7-
bokeh==3.4.2
7+
bokeh==3.6.2
88
# via dask
9-
bottleneck==1.4.0
10-
# via emsarray (setup.cfg)
11-
cartopy==0.23.0
12-
# via emsarray (setup.cfg)
13-
certifi==2024.6.2
9+
bottleneck==1.4.2
10+
# via
11+
# emsarray
12+
# emsarray (pyproject.toml)
13+
cartopy==0.24.1
14+
# via emsarray
15+
certifi==2024.12.14
1416
# via
1517
# netcdf4
1618
# pyproj
1719
# requests
18-
cftime==1.6.4
20+
cftime==1.6.4.post1
1921
# via
2022
# cfunits
2123
# netcdf4
2224
cfunits==3.3.7
23-
# via emsarray (setup.cfg)
24-
charset-normalizer==3.3.2
25+
# via emsarray
26+
charset-normalizer==3.4.1
2527
# via requests
26-
click==8.1.7
28+
click==8.1.8
2729
# via
2830
# dask
2931
# distributed
30-
cloudpickle==3.0.0
32+
cloudpickle==3.1.1
3133
# via
3234
# dask
3335
# distributed
34-
contourpy==1.2.1
36+
contourpy==1.3.1
3537
# via
3638
# bokeh
3739
# matplotlib
38-
coverage[toml]==7.5.4
40+
coverage[toml]==7.6.10
3941
# via pytest-cov
4042
cycler==0.12.1
4143
# via matplotlib
42-
dask[array,complete,dataframe,diagnostics,distributed]==2024.6.2
44+
dask[array,complete,dataframe,diagnostics,distributed]==2025.1.0
4345
# via
44-
# dask-expr
4546
# distributed
4647
# xarray
47-
dask-expr==1.1.6
48-
# via dask
49-
distributed==2024.6.2
48+
distributed==2025.1.0
5049
# via dask
51-
flake8==7.1.0
52-
# via emsarray (setup.cfg)
53-
fonttools==4.53.0
50+
flake8==7.1.1
51+
# via emsarray (pyproject.toml)
52+
fonttools==4.55.4
5453
# via matplotlib
55-
fsspec==2024.6.1
54+
fsspec==2024.12.0
5655
# via dask
57-
geojson==3.1.0
58-
# via emsarray (setup.cfg)
59-
idna==3.7
56+
geojson==3.2.0
57+
# via
58+
# emsarray
59+
# emsarray (pyproject.toml)
60+
idna==3.10
6061
# via requests
61-
importlib-metadata==8.0.0
62+
importlib-metadata==8.6.1
6263
# via dask
6364
iniconfig==2.0.0
6465
# via pytest
6566
isort==5.13.2
66-
# via emsarray (setup.cfg)
67-
jinja2==3.1.4
67+
# via emsarray (pyproject.toml)
68+
jinja2==3.1.5
6869
# via
6970
# bokeh
7071
# dask
7172
# distributed
7273
# pytest-mpl
73-
kiwisolver==1.4.5
74+
kiwisolver==1.4.8
7475
# via matplotlib
7576
locket==1.0.0
7677
# via
7778
# distributed
7879
# partd
7980
lz4==4.3.3
8081
# via dask
81-
markupsafe==2.1.5
82+
markupsafe==3.0.2
8283
# via jinja2
83-
matplotlib==3.9.0
84+
matplotlib==3.10.0
8485
# via
8586
# cartopy
86-
# emsarray (setup.cfg)
87+
# emsarray
8788
# pytest-mpl
8889
mccabe==0.7.0
8990
# via flake8
90-
msgpack==1.0.8
91+
msgpack==1.1.0
9192
# via distributed
92-
mypy==1.10.1
93-
# via emsarray (setup.cfg)
93+
mypy==1.14.1
94+
# via emsarray (pyproject.toml)
9495
mypy-extensions==1.0.0
9596
# via mypy
96-
netcdf4==1.7.1.post1
97-
# via emsarray (setup.cfg)
98-
numpy==2.0.0
97+
netcdf4==1.7.2
98+
# via
99+
# emsarray
100+
# emsarray (pyproject.toml)
101+
numpy==2.2.2
99102
# via
100103
# bokeh
101104
# bottleneck
@@ -104,129 +107,132 @@ numpy==2.0.0
104107
# cfunits
105108
# contourpy
106109
# dask
107-
# emsarray (setup.cfg)
110+
# emsarray
111+
# emsarray (pyproject.toml)
108112
# matplotlib
109113
# netcdf4
110114
# pandas
111115
# pandas-stubs
112-
# pyarrow
113116
# pykdtree
114117
# shapely
115118
# xarray
116-
packaging==24.1
119+
packaging==24.2
117120
# via
118121
# bokeh
119122
# cartopy
120123
# cfunits
121124
# dask
122125
# distributed
123-
# emsarray (setup.cfg)
126+
# emsarray
127+
# emsarray (pyproject.toml)
124128
# matplotlib
125129
# pooch
126130
# pytest
127131
# pytest-mpl
128132
# xarray
129-
pandas==2.2.2
133+
pandas==2.2.3
130134
# via
131135
# bokeh
132136
# dask
133-
# dask-expr
134137
# xarray
135-
pandas-stubs==2.2.2.240603
136-
# via emsarray (setup.cfg)
138+
pandas-stubs==2.2.3.241126
139+
# via emsarray (pyproject.toml)
137140
partd==1.4.2
138141
# via dask
139-
pillow==10.4.0
142+
pillow==11.1.0
140143
# via
141144
# bokeh
142145
# matplotlib
143146
# pytest-mpl
144-
platformdirs==4.2.2
147+
platformdirs==4.3.6
145148
# via pooch
146149
pluggy==1.5.0
147150
# via pytest
148151
pooch==1.8.2
149-
# via emsarray (setup.cfg)
150-
psutil==6.0.0
152+
# via emsarray
153+
psutil==6.1.1
151154
# via distributed
152-
pyarrow==16.1.0
153-
# via
154-
# dask
155-
# dask-expr
156-
pyarrow-hotfix==0.6
155+
pyarrow==19.0.0
157156
# via dask
158-
pycodestyle==2.12.0
157+
pycodestyle==2.12.1
159158
# via flake8
160159
pyflakes==3.2.0
161160
# via flake8
162-
pykdtree==1.3.12
163-
# via emsarray (setup.cfg)
164-
pyparsing==3.1.2
161+
pykdtree==1.3.13
162+
# via emsarray
163+
pyparsing==3.2.1
165164
# via matplotlib
166-
pyproj==3.6.1
165+
pyproj==3.7.0
167166
# via cartopy
168167
pyshp==2.3.1
169168
# via
170169
# cartopy
171-
# emsarray (setup.cfg)
172-
pytest==8.2.2
170+
# emsarray
171+
# emsarray (pyproject.toml)
172+
pytest==8.3.4
173173
# via
174-
# emsarray (setup.cfg)
174+
# emsarray (pyproject.toml)
175175
# pytest-cov
176176
# pytest-mpl
177-
pytest-cov==5.0.0
178-
# via emsarray (setup.cfg)
177+
pytest-cov==6.0.0
178+
# via emsarray (pyproject.toml)
179179
pytest-mpl==0.17.0
180-
# via emsarray (setup.cfg)
180+
# via emsarray (pyproject.toml)
181181
python-dateutil==2.9.0.post0
182182
# via
183183
# matplotlib
184184
# pandas
185-
pytz==2024.1
185+
pytz==2024.2
186186
# via pandas
187-
pyyaml==6.0.1
187+
pyyaml==6.0.2
188188
# via
189189
# bokeh
190190
# dask
191191
# distributed
192192
requests==2.32.3
193193
# via pooch
194-
shapely==2.0.4
194+
shapely==2.0.6
195195
# via
196196
# cartopy
197-
# emsarray (setup.cfg)
198-
six==1.16.0
197+
# emsarray
198+
# emsarray (pyproject.toml)
199+
six==1.17.0
199200
# via python-dateutil
200201
sortedcontainers==2.4.0
201202
# via distributed
202203
tblib==3.0.0
203204
# via distributed
204-
toolz==0.12.1
205+
toolz==1.0.0
205206
# via
206207
# dask
207208
# distributed
208209
# partd
209-
tornado==6.4.1
210+
tornado==6.4.2
210211
# via
211212
# bokeh
212213
# distributed
213-
types-pytz==2024.1.0.20240417
214+
types-pytz==2024.2.0.20241221
214215
# via
215-
# emsarray (setup.cfg)
216+
# emsarray (pyproject.toml)
216217
# pandas-stubs
217218
typing-extensions==4.12.2
218219
# via mypy
219-
tzdata==2024.1
220+
tzdata==2025.1
220221
# via pandas
221-
urllib3==2.2.2
222+
urllib3==2.3.0
222223
# via
223224
# distributed
224225
# requests
225-
xarray[parallel]==2024.6.0
226-
# via emsarray (setup.cfg)
227-
xyzservices==2024.6.0
226+
xarray[parallel]==2025.1.1
227+
# via
228+
# emsarray
229+
# emsarray (pyproject.toml)
230+
xyzservices==2025.1.0
228231
# via bokeh
229232
zict==3.0.0
230233
# via distributed
231-
zipp==3.19.2
234+
zipp==3.21.0
232235
# via importlib-metadata
236+
237+
# The following packages are considered to be unsafe in a requirements file:
238+
# emsarray

0 commit comments

Comments
 (0)