Skip to content

Commit 342496d

Browse files
authored
Merge branch 'main' into py314
2 parents 19ca8e4 + f4cfecc commit 342496d

File tree

6 files changed

+16
-32
lines changed

6 files changed

+16
-32
lines changed

.github/workflows/test-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.6
56+
uses: JamesIves/github-pages-deploy-action@v4.8.0
5757
with:
5858
branch: gh-pages
5959
folder: deploy

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: 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=14
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.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

continuous_integration/environment-mindeps.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +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 drop old versions of packaging
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
1416
- psutil=5.8.0
1517
- pyyaml=5.4.1
1618
- sortedcontainers=2.0.5
@@ -19,8 +21,6 @@ dependencies:
1921
- tornado=6.2.0
2022
- urllib3=1.26.5
2123
- zict=3.0.0
22-
# Temporary fix for https://github.com/pypa/setuptools/issues/4496
23-
- setuptools < 71
2424
# Distributed depends on the latest version of Dask
2525
- pip
2626
- pip:

0 commit comments

Comments
 (0)