From 1ac2bb12512669b7533e7af1a14c8e8b59634d25 Mon Sep 17 00:00:00 2001 From: crusaderky Date: Wed, 31 Dec 2025 13:12:35 +0000 Subject: [PATCH 1/3] Clean up obsolete pins in CI --- continuous_integration/environment-3.10.yaml | 10 +++------- continuous_integration/environment-3.11.yaml | 10 +++------- continuous_integration/environment-3.12.yaml | 10 +++------- continuous_integration/environment-3.13.yaml | 10 +++------- continuous_integration/environment-mindeps.yaml | 4 +--- 5 files changed, 13 insertions(+), 31 deletions(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 6098096e86..13c970c87e 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -20,7 +20,7 @@ dependencies: - ipykernel - ipywidgets - jinja2 - - jupyter_events<0.11 + - jupyter_events - jupyter-server-proxy - jupyterlab - locket @@ -33,7 +33,7 @@ dependencies: - psutil - pyarrow - nvidia-ml-py # Only tested here - - pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693 + - pytest - pytest-cov - pytest-faulthandler - pytest-repeat @@ -45,16 +45,12 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib !=3.2.0,!=3.2.1 + - tblib - toolz - torchvision # Only tested here - tornado - zict # overridden by git tip below - zstandard - # Temporary fix for https://github.com/pypa/setuptools/issues/4496 - - setuptools < 71 - # Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012 - - httpx<0.28.0 - pip: - git+https://github.com/dask/dask - git+https://github.com/dask/zict diff --git a/continuous_integration/environment-3.11.yaml b/continuous_integration/environment-3.11.yaml index c2376a036c..641db193ae 100644 --- a/continuous_integration/environment-3.11.yaml +++ b/continuous_integration/environment-3.11.yaml @@ -18,7 +18,7 @@ dependencies: - ipykernel - ipywidgets - jinja2 - - jupyter_events<0.11 + - jupyter_events - jupyter-server-proxy - jupyterlab - locket @@ -29,7 +29,7 @@ dependencies: - prometheus_client - psutil - pyarrow=14 - - pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693 + - pytest - pytest-cov - pytest-faulthandler - pytest-repeat @@ -39,15 +39,11 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib !=3.2.0,!=3.2.1 + - tblib - toolz - tornado - zict # overridden by git tip below - zstandard - # Temporary fix for https://github.com/pypa/setuptools/issues/4496 - - setuptools < 71 - # Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012 - - httpx<0.28.0 - pip: - git+https://github.com/dask/dask - git+https://github.com/dask/zict diff --git a/continuous_integration/environment-3.12.yaml b/continuous_integration/environment-3.12.yaml index efbb1c4397..7627ef70c7 100644 --- a/continuous_integration/environment-3.12.yaml +++ b/continuous_integration/environment-3.12.yaml @@ -18,7 +18,7 @@ dependencies: - ipykernel - ipywidgets - jinja2 - - jupyter_events<0.11 + - jupyter_events - jupyter-server-proxy - jupyterlab - locket @@ -29,7 +29,7 @@ dependencies: - prometheus_client - psutil - pyarrow - - pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693 + - pytest - pytest-cov - pytest-faulthandler - pytest-repeat @@ -39,15 +39,11 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib !=3.2.0,!=3.2.1 + - tblib - toolz - tornado - zict # overridden by git tip below - zstandard - # Temporary fix for https://github.com/pypa/setuptools/issues/4496 - - setuptools < 71 - # Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012 - - httpx<0.28.0 - pip: - git+https://github.com/dask/dask - git+https://github.com/dask/zict diff --git a/continuous_integration/environment-3.13.yaml b/continuous_integration/environment-3.13.yaml index a3ef5d7451..8112cc2c0e 100644 --- a/continuous_integration/environment-3.13.yaml +++ b/continuous_integration/environment-3.13.yaml @@ -17,7 +17,7 @@ dependencies: - ipykernel - ipywidgets - jinja2 - - jupyter_events<0.11 + - jupyter_events - jupyter-server-proxy - jupyterlab - locket @@ -28,7 +28,7 @@ dependencies: - prometheus_client - psutil - pyarrow - - pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693 + - pytest - pytest-cov - pytest-faulthandler - pytest-repeat @@ -38,15 +38,11 @@ dependencies: - scikit-learn - scipy - sortedcollections - - tblib !=3.2.0,!=3.2.1 + - tblib - toolz - tornado - zict # overridden by git tip below - zstandard - # Temporary fix for https://github.com/pypa/setuptools/issues/4496 - - setuptools < 71 - # Temporary fix for https://github.com/jupyterlab/jupyterlab/issues/17012 - - httpx<0.28.0 - pip: - git+https://github.com/dask/dask - git+https://github.com/dask/zict diff --git a/continuous_integration/environment-mindeps.yaml b/continuous_integration/environment-mindeps.yaml index 3aff3a69e9..d404749ece 100644 --- a/continuous_integration/environment-mindeps.yaml +++ b/continuous_integration/environment-mindeps.yaml @@ -19,14 +19,12 @@ dependencies: - tornado=6.2.0 - urllib3=1.26.5 - zict=3.0.0 - # Temporary fix for https://github.com/pypa/setuptools/issues/4496 - - setuptools < 71 # Distributed depends on the latest version of Dask - pip - pip: - git+https://github.com/dask/dask # test dependencies - - pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693 + - pytest - pytest-cov - pytest-faulthandler - pytest-repeat From 7e5f073a28cc2150d5f25ab5607688d1b88bd5be Mon Sep 17 00:00:00 2001 From: crusaderky Date: Wed, 31 Dec 2025 13:40:37 +0000 Subject: [PATCH 2/3] Fix setuptools regression in mindeps --- continuous_integration/environment-mindeps.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/continuous_integration/environment-mindeps.yaml b/continuous_integration/environment-mindeps.yaml index d404749ece..ddb9fb2178 100644 --- a/continuous_integration/environment-mindeps.yaml +++ b/continuous_integration/environment-mindeps.yaml @@ -10,7 +10,9 @@ dependencies: - locket=1.0.0 - msgpack-python=1.0.2 - packaging=20.0 - - pyparsing<3.3 # Newer versions of pyparsing drop old versions of packaging + - pyparsing<3.3 # Newer versions of pyparsing break with old versions of packaging + - setuptools < 71 # Newer versions of setuptools break with packaging<24 + # https://github.com/pypa/setuptools/issues/4496 - psutil=5.8.0 - pyyaml=5.4.1 - sortedcontainers=2.0.5 @@ -24,7 +26,7 @@ dependencies: - pip: - git+https://github.com/dask/dask # test dependencies - - pytest + - pytest<8.4 # Pin due to https://github.com/pytest-dev/pytest-cov/issues/693 - pytest-cov - pytest-faulthandler - pytest-repeat From 1cd33e130e823a14927922788cdc9aa1dc9d6eef Mon Sep 17 00:00:00 2001 From: crusaderky Date: Wed, 31 Dec 2025 13:42:34 +0000 Subject: [PATCH 3/3] cosmetic --- continuous_integration/environment-mindeps.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/continuous_integration/environment-mindeps.yaml b/continuous_integration/environment-mindeps.yaml index ddb9fb2178..5337d70fba 100644 --- a/continuous_integration/environment-mindeps.yaml +++ b/continuous_integration/environment-mindeps.yaml @@ -11,8 +11,8 @@ dependencies: - msgpack-python=1.0.2 - packaging=20.0 - pyparsing<3.3 # Newer versions of pyparsing break with old versions of packaging - - setuptools < 71 # Newer versions of setuptools break with packaging<24 - # https://github.com/pypa/setuptools/issues/4496 + - setuptools<71 # Newer versions of setuptools break with packaging<24 + # https://github.com/pypa/setuptools/issues/4496 - psutil=5.8.0 - pyyaml=5.4.1 - sortedcontainers=2.0.5