From 1351630d489ba8689c484e6449f6f5d63e4fec1e Mon Sep 17 00:00:00 2001 From: Gabe Joseph Date: Fri, 18 Nov 2022 09:19:11 -0700 Subject: [PATCH] Restrict `bokeh=3` support (#9673) --- continuous_integration/environment-3.10.yaml | 3 ++- continuous_integration/environment-3.8.yaml | 3 ++- continuous_integration/environment-3.9.yaml | 3 ++- setup.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/continuous_integration/environment-3.10.yaml b/continuous_integration/environment-3.10.yaml index 0f90af51699..87a5d148ff6 100644 --- a/continuous_integration/environment-3.10.yaml +++ b/continuous_integration/environment-3.10.yaml @@ -37,7 +37,8 @@ dependencies: # other -- IO - boto3 - botocore - - bokeh + # Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved + - bokeh<3 - httpretty - aiohttp # Need recent version of s3fs to support newer aiobotocore versions diff --git a/continuous_integration/environment-3.8.yaml b/continuous_integration/environment-3.8.yaml index d21068a14a8..2c38048dc1c 100644 --- a/continuous_integration/environment-3.8.yaml +++ b/continuous_integration/environment-3.8.yaml @@ -37,7 +37,8 @@ dependencies: # other -- IO - boto3 - botocore - - bokeh + # Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved + - bokeh<3 - httpretty - aiohttp # Need recent version of s3fs to support newer aiobotocore versions diff --git a/continuous_integration/environment-3.9.yaml b/continuous_integration/environment-3.9.yaml index 54ec3634527..7340d5c9dd4 100644 --- a/continuous_integration/environment-3.9.yaml +++ b/continuous_integration/environment-3.9.yaml @@ -37,7 +37,8 @@ dependencies: # other -- IO - boto3 - botocore - - bokeh + # Temporary restriction until https://github.com/dask/distributed/issues/7173 is resolved + - bokeh<3 - httpretty - aiohttp # Need recent version of s3fs to support newer aiobotocore versions diff --git a/setup.py b/setup.py index 6017bfc18a3..30ba794101d 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ "dataframe": ["numpy >= 1.18", "pandas >= 1.0"], "distributed": ["distributed == 2022.11.0"], "diagnostics": [ - "bokeh >= 2.4.2", + "bokeh >= 2.4.2, <3", "jinja2", ], "delayed": [], # keeping for backwards compatibility