Skip to content

Commit 7ae8824

Browse files
authored
Merge branch 'main' into an-add-docs
2 parents 40508f6 + fa8c781 commit 7ae8824

35 files changed

+209
-114
lines changed

.github/workflows/test-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: mamba list
3636
run: mamba list
3737

38-
- uses: actions/cache@v4
38+
- uses: actions/cache@v5
3939
id: cache
4040
with:
4141
# Suffix is depending on the backend / OS. Let's be agnostic here
@@ -53,7 +53,7 @@ jobs:
5353
mv test_report.html test_short_report.html deploy/
5454
5555
- name: Deploy 🚀
56-
uses: JamesIves/github-pages-deploy-action@v4.7.4
56+
uses: JamesIves/github-pages-deploy-action@v4.8.0
5757
with:
5858
branch: gh-pages
5959
folder: deploy

.github/workflows/tests.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,22 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [ubuntu-latest, windows-latest, macos-latest]
29-
environment: [mindeps, "3.10", "3.11", "3.12", "3.13"]
29+
environment: [mindeps, "3.10", "3.11", "3.12", "3.13", "3.14"]
3030
label: [default]
3131
extra_packages: [null]
3232
# Cherry-pick test modules to split the overall runtime roughly in half
3333
partition: [ci1, not ci1]
3434

3535
exclude:
36-
# MacOS CI does not have any hosts available; run it on 3.12 only
36+
# MacOS CI does not have many hosts available; run it on 3.14 only
3737
- os: macos-latest
3838
environment: mindeps
3939
- os: macos-latest
4040
environment: "3.10"
4141
- os: macos-latest
4242
environment: "3.11"
43+
- os: macos-latest
44+
environment: "3.12"
4345
- os: macos-latest
4446
environment: "3.13"
4547

@@ -73,12 +75,12 @@ jobs:
7375
- os: ubuntu-latest
7476
environment: mindeps
7577
label: pandas
76-
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=14.0.1]
78+
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=16.0]
7779
partition: "ci1"
7880
- os: ubuntu-latest
7981
environment: mindeps
8082
label: pandas
81-
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=14.0.1]
83+
extra_packages: [numpy=1.24, pandas=2.0, pyarrow=16.0]
8284
partition: "not ci1"
8385

8486
- os: ubuntu-latest
@@ -145,7 +147,7 @@ jobs:
145147

146148
- name: Cache Conda env
147149
if: steps.skip-caching.outputs.trigger-found != 'true'
148-
uses: actions/cache@v4
150+
uses: actions/cache@v5
149151
with:
150152
path: ${{ env.CONDA }}/envs
151153
key: conda-${{ matrix.os }}-${{ matrix.environment }}-${{ matrix.label }}-${{ steps.get-date.outputs.today }}-${{ hashFiles(env.CONDA_FILE) }}-${{ env.CACHE_NUMBER }}
@@ -281,7 +283,7 @@ jobs:
281283
if: >
282284
always() &&
283285
(steps.run_tests.outcome == 'success' || steps.run_tests.outcome == 'failure')
284-
uses: actions/upload-artifact@v5
286+
uses: actions/upload-artifact@v6
285287
with:
286288
name: ${{ env.TEST_ID }}
287289
path: reports
@@ -291,7 +293,7 @@ jobs:
291293
if: >
292294
always() &&
293295
(steps.run_tests.outcome == 'success' || steps.run_tests.outcome == 'failure')
294-
uses: actions/upload-artifact@v5
296+
uses: actions/upload-artifact@v6
295297
with:
296298
name: ${{ env.TEST_ID }}_cluster_dumps
297299
path: test_cluster_dump
@@ -305,7 +307,7 @@ jobs:
305307
runs-on: ubuntu-latest
306308
steps:
307309
- name: Upload
308-
uses: actions/upload-artifact@v5
310+
uses: actions/upload-artifact@v6
309311
with:
310312
name: Event File
311313
path: ${{ github.event_path }}

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.14.5
3+
rev: v0.14.10
44
hooks:
55
- id: ruff-check
66
- repo: https://github.com/psf/black-pre-commit-mirror
7-
rev: 25.11.0
7+
rev: 25.12.0
88
hooks:
99
- id: black
1010
- repo: https://github.com/codespell-project/codespell
11-
rev: v2.3.0
11+
rev: v2.4.1
1212
hooks:
1313
- id: codespell
1414
additional_dependencies:
1515
- tomli
1616
types_or: [rst, markdown]
1717
files: docs
1818
- repo: https://github.com/pre-commit/mirrors-mypy
19-
rev: v1.11.2
19+
rev: v1.19.1
2020
hooks:
2121
- id: mypy
2222
# Override default --ignore-missing-imports

continuous_integration/environment-3.10.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- ipykernel
2121
- ipywidgets
2222
- jinja2
23-
- jupyter_events<0.11
23+
- jupyter_events
2424
- jupyter-server-proxy
2525
- jupyterlab
2626
- locket
@@ -33,7 +33,7 @@ dependencies:
3333
- psutil
3434
- pyarrow
3535
- nvidia-ml-py # Only tested here
36-
- pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693
36+
- pytest
3737
- pytest-cov
3838
- pytest-faulthandler
3939
- pytest-repeat
@@ -45,16 +45,12 @@ dependencies:
4545
- scikit-learn
4646
- scipy
4747
- sortedcollections
48-
- tblib !=3.2.0,!=3.2.1
48+
- tblib
4949
- toolz
5050
- torchvision # Only tested here
5151
- tornado
5252
- zict # overridden by git tip below
5353
- zstandard
54-
# Temporary fix for https://github.com/pypa/setuptools/issues/4496
55-
- setuptools < 71
56-
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
57-
- httpx<0.28.0
5854
- pip:
5955
- git+https://github.com/dask/dask
6056
- git+https://github.com/dask/zict

continuous_integration/environment-3.11.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- ipykernel
1919
- ipywidgets
2020
- jinja2
21-
- jupyter_events<0.11
21+
- jupyter_events
2222
- jupyter-server-proxy
2323
- jupyterlab
2424
- locket
@@ -28,8 +28,8 @@ dependencies:
2828
- pre-commit
2929
- prometheus_client
3030
- psutil
31-
- pyarrow=14
32-
- pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693
31+
- pyarrow=16.0
32+
- pytest
3333
- pytest-cov
3434
- pytest-faulthandler
3535
- pytest-repeat
@@ -39,15 +39,11 @@ dependencies:
3939
- scikit-learn
4040
- scipy
4141
- sortedcollections
42-
- tblib !=3.2.0,!=3.2.1
42+
- tblib
4343
- toolz
4444
- tornado
4545
- zict # overridden by git tip below
4646
- zstandard
47-
# Temporary fix for https://github.com/pypa/setuptools/issues/4496
48-
- setuptools < 71
49-
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
50-
- httpx<0.28.0
5147
- pip:
5248
- git+https://github.com/dask/dask
5349
- git+https://github.com/dask/zict

continuous_integration/environment-3.12.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- ipykernel
1919
- ipywidgets
2020
- jinja2
21-
- jupyter_events<0.11
21+
- jupyter_events
2222
- jupyter-server-proxy
2323
- jupyterlab
2424
- locket
@@ -29,7 +29,7 @@ dependencies:
2929
- prometheus_client
3030
- psutil
3131
- pyarrow
32-
- pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693
32+
- pytest
3333
- pytest-cov
3434
- pytest-faulthandler
3535
- pytest-repeat
@@ -39,15 +39,11 @@ dependencies:
3939
- scikit-learn
4040
- scipy
4141
- sortedcollections
42-
- tblib !=3.2.0,!=3.2.1
42+
- tblib
4343
- toolz
4444
- tornado
4545
- zict # overridden by git tip below
4646
- zstandard
47-
# Temporary fix for https://github.com/pypa/setuptools/issues/4496
48-
- setuptools < 71
49-
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
50-
- httpx<0.28.0
5147
- pip:
5248
- git+https://github.com/dask/dask
5349
- git+https://github.com/dask/zict

continuous_integration/environment-3.13.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- ipykernel
1818
- ipywidgets
1919
- jinja2
20-
- jupyter_events<0.11
20+
- jupyter_events
2121
- jupyter-server-proxy
2222
- jupyterlab
2323
- locket
@@ -28,7 +28,7 @@ dependencies:
2828
- prometheus_client
2929
- psutil
3030
- pyarrow
31-
- pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693
31+
- pytest
3232
- pytest-cov
3333
- pytest-faulthandler
3434
- pytest-repeat
@@ -38,15 +38,11 @@ dependencies:
3838
- scikit-learn
3939
- scipy
4040
- sortedcollections
41-
- tblib !=3.2.0,!=3.2.1
41+
- tblib
4242
- toolz
4343
- tornado
4444
- zict # overridden by git tip below
4545
- zstandard
46-
# Temporary fix for https://github.com/pypa/setuptools/issues/4496
47-
- setuptools < 71
48-
# Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012
49-
- httpx<0.28.0
5046
- pip:
5147
- git+https://github.com/dask/dask
5248
- git+https://github.com/dask/zict
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: dask-distributed-313
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.14
6+
- packaging
7+
- pip
8+
- asyncssh
9+
- bokeh>3
10+
- click
11+
- cloudpickle
12+
- coverage
13+
- dask # overridden by git tip below
14+
- fsspec # overridden by git tip below
15+
- gilknocker
16+
- h5py
17+
- ipykernel
18+
- ipywidgets
19+
- jinja2
20+
- jupyter_events
21+
- jupyter-server-proxy
22+
- jupyterlab
23+
- locket
24+
- msgpack-python
25+
- netcdf4
26+
- paramiko
27+
- pre-commit
28+
- prometheus_client
29+
- psutil
30+
- pyarrow
31+
- pytest
32+
- pytest-cov
33+
- pytest-faulthandler
34+
- pytest-repeat
35+
- pytest-rerunfailures
36+
- pytest-timeout
37+
- requests
38+
- scikit-learn
39+
- scipy
40+
- sortedcollections
41+
- tblib
42+
- toolz
43+
- tornado
44+
- zict # overridden by git tip below
45+
- zstandard
46+
- pip:
47+
- git+https://github.com/dask/dask
48+
- git+https://github.com/dask/zict
49+
- git+https://github.com/fsspec/filesystem_spec
50+
- keras

continuous_integration/environment-mindeps.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ dependencies:
1010
- locket=1.0.0
1111
- msgpack-python=1.0.2
1212
- packaging=20.0
13+
- pyparsing<3.3 # Newer versions of pyparsing break with old versions of packaging
14+
- setuptools<71 # Newer versions of setuptools break with packaging<24
15+
# https://github.com/pypa/setuptools/issues/4496
1316
- psutil=5.8.0
1417
- pyyaml=5.4.1
1518
- sortedcontainers=2.0.5
@@ -18,8 +21,6 @@ dependencies:
1821
- tornado=6.2.0
1922
- urllib3=1.26.5
2023
- zict=3.0.0
21-
# Temporary fix for https://github.com/pypa/setuptools/issues/4496
22-
- setuptools < 71
2324
# Distributed depends on the latest version of Dask
2425
- pip
2526
- pip:

continuous_integration/recipes/dask/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ requirements:
2727
- {{ pin_compatible('distributed', exact=True) }}
2828
- cytoolz >=0.11.2
2929
- lz4 >=4.3.2
30-
- numpy >=1.21
30+
- numpy >=1.24
3131
- pandas >=2
3232
- bokeh >=3.1.0
3333
- jinja2 >=2.10.3
34-
- pyarrow >=7.0
34+
- pyarrow >=16
3535

3636
run_constrained:
3737
- openssl !=1.1.1e

0 commit comments

Comments
 (0)