Merge branch 'branch-24.10' into miniforge

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
                 # Explicitly specify the pyproject.toml at the repo root, not per-project.
                 args: ["--config", "pyproject.toml"]
       - repo: https://github.com/PyCQA/flake8
-        rev: 6.0.0
+        rev: 7.1.1
         hooks:
               - id: flake8
                 args: ["--config=.flake8"]

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -7,6 +7,7 @@ channels:
 - nvidia
 dependencies:
 - bokeh>=3.1
+- bokeh_sampledata
 - cuda-version=11.8
 - cudatoolkit
 - cudf==24.10.*,>=0.0.0a0

conda/environments/all_cuda-125_arch-x86_64.yaml

@@ -7,6 +7,7 @@ channels:
 - nvidia
 dependencies:
 - bokeh>=3.1
+- bokeh_sampledata
 - cuda-version=12.5
 - cudf==24.10.*,>=0.0.0a0
 - cugraph==24.10.*,>=0.0.0a0

dependencies.yaml

@@ -137,6 +137,7 @@ dependencies:
     common:
       - output_types: [conda, requirements]
         packages:
+          - bokeh_sampledata
           - ipykernel
           - ipython
           - jupyter_sphinx
@@ -153,6 +154,7 @@ dependencies:
     common:
       - output_types: [conda, requirements]
         packages:
+          - bokeh_sampledata
           - ipython
           - notebook>=0.5.0
       - output_types: [conda]

python/cuxfilter/charts/core/non_aggregate/core_non_aggregate.py

@@ -31,8 +31,8 @@ def name(self):
         chart_type = self.chart_type if self.chart_type else "chart"
         return (
             f"{self.x}_{self.y}"
-            f"{'_'+self.aggregate_col if self.aggregate_col else ''}"
-            f"{'_'+self.aggregate_fn if self.aggregate_fn else ''}"
+            f"{'_' + self.aggregate_col if self.aggregate_col else ''}"
+            f"{'_' + self.aggregate_fn if self.aggregate_fn else ''}"
             f"_{chart_type}_{self.title}"
         )
 

python/cuxfilter/charts/core/non_aggregate/core_stacked_line.py

@@ -21,7 +21,6 @@ class BaseStackedLine(BaseChart):
     y_range: Tuple = None
     use_data_tiles = False
     y: list = []
-    colors: list = []
     default_colors = ["#8735fb"]
     box_selected_range = None
 

python/cuxfilter/dashboard.py

@@ -308,7 +308,7 @@ def _generate_query_str(self, query_dict=None, ignore_chart=""):
 
         # extract string queries from query_dict,
         # as self.query_dict also contains cudf.Series indices
-        str_queries_list = [x for x in query_dict.values() if type(x) == str]
+        str_queries_list = [x for x in query_dict.values() if type(x) is str]
         return_query_str = " and ".join(str_queries_list)
 
         # adding the popped value to the query_str_dict again