diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 199494cc..a60e5d76 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -59,7 +59,7 @@ gpuci_mamba_retry install -y \ "cuspatial=$MINOR_VERSION.*" \ "dask-cudf=$MINOR_VERSION.*" "dask-cuda=$MINOR_VERSION.*" \ "numba>=0.51.2" \ - "bokeh>=2.3.2,<2.4" \ + "bokeh>=2.3.2,<=2.4" \ "rapids-build-env=$MINOR_VERSION.*" \ "rapids-notebook-env=$MINOR_VERSION.*" diff --git a/conda/environments/cuxfilter_dev_cuda10.1.yml b/conda/environments/cuxfilter_dev_cuda10.1.yml index f640e72f..f5c243fb 100644 --- a/conda/environments/cuxfilter_dev_cuda10.1.yml +++ b/conda/environments/cuxfilter_dev_cuda10.1.yml @@ -20,8 +20,8 @@ dependencies: - pyproj>=2.4, <=3.1 - libwebp - pandoc=<2.0.0 -- bokeh>=2.3.2,<2.4 -- panel>=0.10.3 +- bokeh>=2.3.2,<=2.4 +- panel>=0.10.3,<=0.12.4 - pyppeteer>=0.2.6 - cudatoolkit=10.1 - nodejs diff --git a/conda/environments/cuxfilter_dev_cuda10.2.yml b/conda/environments/cuxfilter_dev_cuda10.2.yml index b7eba066..bf81f061 100644 --- a/conda/environments/cuxfilter_dev_cuda10.2.yml +++ b/conda/environments/cuxfilter_dev_cuda10.2.yml @@ -21,8 +21,8 @@ dependencies: - pyproj>=2.4, <=3.1 - libwebp - pandoc=<2.0.0 -- bokeh>=2.3.2,<2.4 -- panel>=0.10.3 +- bokeh>=2.3.2,<=2.4 +- panel>=0.10.3,<=0.12.4 - pyppeteer>=0.2.6 - cudatoolkit=10.2 - nodejs diff --git a/conda/environments/cuxfilter_dev_cuda11.0.yml b/conda/environments/cuxfilter_dev_cuda11.0.yml index 80be5342..3d86fa73 100644 --- a/conda/environments/cuxfilter_dev_cuda11.0.yml +++ b/conda/environments/cuxfilter_dev_cuda11.0.yml @@ -20,8 +20,8 @@ dependencies: - pyproj>=2.4, <=3.1 - libwebp - pandoc=<2.0.0 -- bokeh>=2.3.2,<2.4 -- panel>=0.10.3 +- bokeh>=2.3.2,<=2.4 +- panel>=0.10.3,<=0.12.4 - pyppeteer>=0.2.6 - cudatoolkit=11.0 - nodejs diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml index 6870a0f8..7e012c43 100644 --- a/conda/recipes/cuxfilter/meta.yaml +++ b/conda/recipes/cuxfilter/meta.yaml @@ -34,9 +34,9 @@ requirements: - datashader >=0.11.1, <0.12 - numba >=0.51.2 - cupy >=7.8.0,<10.0.0a0 - - panel >=0.10.3 + - panel >=0.10.3,<=0.12.4 - pyppeteer>=0.2.6 - - bokeh >=2.3.2,<2.4 + - bokeh >=2.3.2,<=2.4 - pyproj >=2.4, <=3.1 - geopandas >=0.9.0,<0.10.0a0 - nodejs >=12,<15 diff --git a/python/cuxfilter/dashboard.py b/python/cuxfilter/dashboard.py index e4f548f9..0b78973e 100644 --- a/python/cuxfilter/dashboard.py +++ b/python/cuxfilter/dashboard.py @@ -199,8 +199,6 @@ def __init__( self._sidebar = dict() self._data_tiles = dict() self._query_str_dict = dict() - if data_size_widget: - sidebar.insert(0, data_size_indicator()) # check if charts and sidebar lists contain cuxfilter.charts with # duplicate names @@ -212,16 +210,23 @@ def __init__( # and resolution constraints # process all main dashboard charts for chart in charts: + chart.initiate_chart(self) + chart._initialized = True self._charts[chart.name] = chart + + # add data_size_indicator to sidebar if data_size_widget=True + if data_size_widget: + chart = data_size_indicator() chart.initiate_chart(self) chart._initialized = True + self._sidebar[chart.name] = chart # process all sidebar widgets for chart in sidebar: if chart.is_widget: - self._sidebar[chart.name] = chart chart.initiate_chart(self) chart._initialized = True + self._sidebar[chart.name] = chart self.title = title self._dashboard = layout()