Skip to content

Commit cd6862b

Browse files
authored
Bump min deps. (#8586)
* Bump min deps. Closes #8581 * Fix scipy * Update bare-minimum * Consolidate CI jobs * Fix flox * Flox 0.7 0.8 enforces 0numbagg > 0.6 * Update packaging * update whats-new list
1 parent bc2ac07 commit cd6862b

File tree

5 files changed

+51
-29
lines changed

5 files changed

+51
-29
lines changed

.github/workflows/ci-additional.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,6 @@ jobs:
320320
run:
321321
shell: bash -l {0}
322322

323-
strategy:
324-
matrix:
325-
environment-file: ["bare-minimum", "min-all-deps"]
326-
fail-fast: false
327-
328323
steps:
329324
- uses: actions/checkout@v4
330325
with:
@@ -340,6 +335,10 @@ jobs:
340335
conda
341336
python-dateutil
342337
343-
- name: minimum versions policy
338+
- name: All-deps minimum versions policy
339+
run: |
340+
python ci/min_deps_check.py ci/requirements/min-all-deps.yml
341+
342+
- name: Bare minimum versions policy
344343
run: |
345-
python ci/min_deps_check.py ci/requirements/${{ matrix.environment-file }}.yml
344+
python ci/min_deps_check.py ci/requirements/bare-minimum.yml

ci/requirements/bare-minimum.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ dependencies:
1111
- pytest-env
1212
- pytest-xdist
1313
- pytest-timeout
14-
- numpy=1.22
15-
- packaging=21.3
16-
- pandas=1.4
14+
- numpy=1.23
15+
- packaging=22.0
16+
- pandas=1.5

ci/requirements/min-all-deps.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,35 @@ dependencies:
1010
- python=3.9
1111
- boto3=1.24
1212
- bottleneck=1.3
13-
- cartopy=0.20
13+
- cartopy=0.21
1414
- cftime=1.6
1515
- coveralls
16-
- dask-core=2022.7
17-
- distributed=2022.7
18-
- flox=0.5
16+
- dask-core=2022.12
17+
- distributed=2022.12
18+
# Flox > 0.8 has a bug with numbagg versions
19+
# It will require numbagg > 0.6
20+
# so we should just skip that series eventually
21+
# or keep flox pinned for longer than necessary
22+
- flox=0.7
1923
- h5netcdf=1.1
2024
# h5py and hdf5 tend to cause conflicts
2125
# for e.g. hdf5 1.12 conflicts with h5py=3.1
2226
# prioritize bumping other packages instead
2327
- h5py=3.7
2428
- hdf5=1.12
2529
- hypothesis
26-
- iris=3.2
30+
- iris=3.4
2731
- lxml=4.9 # Optional dep of pydap
28-
- matplotlib-base=3.5
32+
- matplotlib-base=3.6
2933
- nc-time-axis=1.4
3034
# netcdf follows a 1.major.minor[.patch] convention
3135
# (see https://github.com/Unidata/netcdf4-python/issues/1090)
3236
- netcdf4=1.6.0
33-
- numba=0.55
34-
- numpy=1.22
35-
- packaging=21.3
36-
- pandas=1.4
37+
- numba=0.56
38+
- numbagg=0.2.1
39+
- numpy=1.23
40+
- packaging=22.0
41+
- pandas=1.5
3742
- pint=0.22
3843
- pip
3944
- pydap=3.3
@@ -43,11 +48,9 @@ dependencies:
4348
- pytest-xdist
4449
- pytest-timeout
4550
- rasterio=1.3
46-
- scipy=1.8
47-
- seaborn=0.11
51+
- scipy=1.10
52+
- seaborn=0.12
4853
- sparse=0.13
4954
- toolz=0.12
50-
- typing_extensions=4.3
51-
- zarr=2.12
52-
- pip:
53-
- numbagg==0.2.1
55+
- typing_extensions=4.4
56+
- zarr=2.13

doc/whats-new.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,26 @@ New Features
3434
Breaking changes
3535
~~~~~~~~~~~~~~~~
3636

37+
- The minimum versions of some dependencies were changed (:pull:`8586`):
38+
39+
===================== ========= ========
40+
Package Old New
41+
===================== ========= ========
42+
cartopy 0.20 0.21
43+
dask-core 2022.7 2022.12
44+
distributed 2022.7 2022.12
45+
flox 0.5 0.7
46+
iris 3.2 3.4
47+
matplotlib-base 3.5 3.6
48+
numpy 1.22 1.23
49+
numba 0.55 0.56
50+
packaging 21.3 22.0
51+
seaborn 0.11 0.12
52+
scipy 1.8 1.10
53+
typing_extensions 4.3 4.4
54+
zarr 2.12 2.13
55+
===================== ========= ========
56+
3757

3858
Deprecations
3959
~~~~~~~~~~~~

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ readme = "README.md"
2222
requires-python = ">=3.9"
2323

2424
dependencies = [
25-
"numpy>=1.22",
26-
"packaging>=21.3",
27-
"pandas>=1.4",
25+
"numpy>=1.23",
26+
"packaging>=22",
27+
"pandas>=1.5",
2828
]
2929

3030
[project.urls]

0 commit comments

Comments
 (0)