Upgrade to mypy 1.10.0 and ruff 0.4.2 (bokeh#13840)

* Upgrade to mypy 1.10

* Help out mypy with explicit type annotations

* Upgrade to ruff 0.4.2

* Replace legacy string formatting with f-strings

* Silence ruff's configuration warnings

* Use py310 as ruff's target-version

* Ignore B905 (zip() without strict= parameter)

* Replace (A, B) with A | B in isinstance()

* Deal with pre-PEP 701 f-strings

* Use iterator instead of an array

* Modernize and robustify customjs_for_hover.py

Author: mattpap

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_stages: [push]
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.2
+    rev: v0.4.2
     hooks:
       - id: ruff
         stages: [commit]

conda/environment-test-3.10.yml

@@ -63,7 +63,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.8
+    - mypy >=1.10
     # docs
     - pydata_sphinx_theme
     - requests-unixsocket >= 0.3.0
@@ -74,7 +74,7 @@ dependencies:
     - sphinxext-opengraph
     # tests
     - pandas-stubs >=2.2
-    - ruff ==0.2.2
+    - ruff ==0.4.2
     - types-boto
     - types-colorama
     - types-mock

conda/environment-test-3.11.yml

@@ -63,7 +63,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.8
+    - mypy >=1.10
     # docs
     - pydata_sphinx_theme
     - requests-unixsocket >= 0.3.0
@@ -74,7 +74,7 @@ dependencies:
     - sphinxext-opengraph
     # tests
     - pandas-stubs >=2.2
-    - ruff ==0.2.2
+    - ruff ==0.4.2
     - types-boto
     - types-colorama
     - types-mock

conda/environment-test-3.12.yml

@@ -63,7 +63,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.8
+    - mypy >=1.10
     # docs
     - pydata_sphinx_theme
     - requests-unixsocket >= 0.3.0
@@ -74,7 +74,7 @@ dependencies:
     - sphinxext-opengraph
     # tests
     - pandas-stubs >=2.2
-    - ruff ==0.2.2
+    - ruff ==0.4.2
     - types-boto
     - types-colorama
     - types-mock

conda/environment-test-minimal-deps.yml

@@ -53,7 +53,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.8
+    - mypy >=1.10
     # docs
     - pydata_sphinx_theme
     - requests-unixsocket >= 0.3.0
@@ -63,7 +63,7 @@ dependencies:
     - sphinx-favicon
     - sphinxext-opengraph
     # tests
-    - ruff ==0.2.2
+    - ruff ==0.4.2
     - types-boto
     - types-colorama
     - types-mock

examples/interaction/js_callbacks/customjs_for_hover.py

@@ -11,7 +11,6 @@
 
 '''
 
-
 from bokeh.models import ColumnDataSource, CustomJS, HoverTool
 from bokeh.plotting import figure, show
 
@@ -29,29 +28,26 @@
 
 p = figure(width=400, height=400, tools="", toolbar_location=None, title='Hover over points')
 
-source = ColumnDataSource({'x0': [], 'y0': [], 'x1': [], 'y1': []})
+source = ColumnDataSource(dict(x0=[], y0=[], x1=[], y1=[]))
 sr = p.segment(x0='x0', y0='y0', x1='x1', y1='y1', color='olive', alpha=0.6, line_width=3, source=source )
 cr = p.scatter(x, y, color='olive', size=30, alpha=0.4, hover_color='olive', hover_alpha=1.0)
 
 # add a hover tool that sets the link data for a hovered circle
 code = """
-const links = %s
-const data = {'x0': [], 'y0': [], 'x1': [], 'y1': []}
-const indices = cb_data.index.indices
-for (let i = 0; i < indices.length; i++) {
-    const start = indices[i]
-    for (let j = 0; j < links[start].length; j++) {
-        const end = links[start][j]
-        data['x0'].push(circle.data.x[start])
-        data['y0'].push(circle.data.y[start])
-        data['x1'].push(circle.data.x[end])
-        data['y1'].push(circle.data.y[end])
+const data = {x0: [], y0: [], x1: [], y1: []}
+const {indices} = cb_data.index
+for (const start of indices) {
+    for (const end of links.get(start)) {
+        data.x0.push(circle.data.x[start])
+        data.y0.push(circle.data.y[start])
+        data.x1.push(circle.data.x[end])
+        data.y1.push(circle.data.y[end])
     }
 }
 segment.data = data
-""" % links
+"""
 
-callback = CustomJS(args={'circle': cr.data_source, 'segment': sr.data_source}, code=code)
+callback = CustomJS(args=dict(circle=cr.data_source, segment=sr.data_source, links=links), code=code)
 p.add_tools(HoverTool(tooltips=None, callback=callback, renderers=[cr]))
 
 show(p)

examples/models/trail.py

@@ -70,7 +70,7 @@ def trail_map(data):
 
     map_options = GMapOptions(lng=lon, lat=lat, zoom=13)
     plot = GMapPlot(width=800, height=800, map_options=map_options, api_key=API_KEY)
-    plot.title.text = "%s - Trail Map" % name
+    plot.title.text = f"{name} - Trail Map"
     plot.x_range = Range1d()
     plot.y_range = Range1d()
     plot.add_tools(PanTool(), WheelZoomTool(), ResetTool())
@@ -89,7 +89,7 @@ def trail_map(data):
 
 def altitude_profile(data):
     plot = Plot(width=800, height=400)
-    plot.title.text = "%s - Altitude Profile" % name
+    plot.title.text = f"{name} - Altitude Profile"
     plot.y_range.range_padding = 0
 
     xaxis = LinearAxis(axis_label="Distance (km)")

examples/server/app/server_auth/app.py

@@ -53,7 +53,7 @@
 phase = Slider(title="phase", value=0.0, start=0.0, end=2*np.pi)
 freq = Slider(title="frequency", value=1.0, start=0.1, end=5.1, step=0.1)
 logout = Button(label="logout")
-logout.js_on_event("button_click", CustomJS(code="window.location.href='%s'" % curdoc().session_context.logout_url))
+logout.js_on_event("button_click", CustomJS(code=f"window.location.href='{curdoc().session_context.logout_url}'"))
 
 # Set up callbacks
 def update_title(attrname, old, new):

pyproject.toml

@@ -139,14 +139,14 @@ exclude_lines = [
 ]
 
 [tool.ruff]
-allowed-confusables = ["σ"]
-exclude = [
+lint.allowed-confusables = ["σ"]
+lint.exclude = [
     ".git",
     'node_modules',
 ]
-per-file-ignores = {"__init__.py" = ["F403"]}
-select = ["B", "COM", "E", "F", "RUF", "TID", "UP", "W"]
-ignore = [
+lint.per-file-ignores = {"__init__.py" = ["F403"]}
+lint.select = ["B", "COM", "E", "F", "RUF", "TID", "UP", "W"]
+lint.ignore = [
     'B005', # Using .strip() with multi-character strings is misleading the reader
     'B006', # Do not use mutable data structures for argument defaults
     'B007', # Loop control variable not used within the loop body
@@ -160,6 +160,7 @@ ignore = [
     'B023', # Functions defined inside a loop must not use variables redefined in the loop
     'B028', # No explicit `stacklevel` keyword argument found
     'B904', # Within an except clause, raise exceptions with raise ... from err or raise ... from None to distinguish them from errors in exception handling
+    'B905', # `zip()` without an explicit `strict=` parameter
     'E401', # Multiple imports on one line
     'E402', # Module level import not at top of file
     'E701', # Multiple statements on one line (colon)
@@ -171,7 +172,7 @@ ignore = [
     'TID252', # Prefer absolute imports over relative imports from parent modules
 ]
 line-length = 165
-target-version = "py39"
+target-version = "py310"
 
 # For now enable each typed module individually.
 [[tool.mypy.overrides]]

src/bokeh/application/application.py

@@ -165,7 +165,7 @@ def add(self, handler: Handler) -> None:
         static_paths = {h.static_path() for h in self.handlers}
         static_paths.discard(None)
         if len(static_paths) > 1:
-            raise RuntimeError("More than one static path requested for app: %r" % list(static_paths))
+            raise RuntimeError(f"More than one static path requested for app: {list(static_paths)!r}")
         elif len(static_paths) == 1:
             self._static_path = static_paths.pop()
         else:

src/bokeh/client/connection.py

@@ -154,7 +154,7 @@ def connect(self) -> None:
         def connected_or_closed() -> bool:
             # we should be looking at the same state here as the 'connected' property above, so connected
             # means both connected and that we did our initial message exchange
-            return isinstance(self._state, (CONNECTED_AFTER_ACK, DISCONNECTED))
+            return isinstance(self._state, CONNECTED_AFTER_ACK | DISCONNECTED)
         self._loop_until(connected_or_closed)
 
     def close(self, why: str = "closed") -> None:
@@ -352,7 +352,7 @@ async def _pop_message(self) -> Message[Any] | None:
             try:
                 message = await self._receiver.consume(fragment)
                 if message is not None:
-                    log.debug("Received message %r" % message)
+                    log.debug(f"Received message {message!r}")
                     return message
             except (MessageError, ProtocolError, ValidationError) as e:
                 log.error("%r", e, exc_info=True)

src/bokeh/command/bootstrap.py

@@ -89,7 +89,7 @@ def main(argv: Sequence[str]) -> None:
 
     '''
     if len(argv) == 1:
-        die("ERROR: Must specify subcommand, one of: %s" % nice_join([x.name for x in subcommands.all]))
+        die(f"ERROR: Must specify subcommand, one of: {nice_join(x.name for x in subcommands.all)}")
 
     parser = argparse.ArgumentParser(
         prog=argv[0],

src/bokeh/command/subcommands/file_output.py

@@ -85,7 +85,7 @@ class Foo(FileOutputSubcommand):
         return ('files', Argument(
             metavar='DIRECTORY-OR-SCRIPT',
             nargs='+',
-            help=("The app directories or scripts to generate %s for" % (output_type_name)),
+            help=(f"The app directories or scripts to generate {output_type_name} for"),
             default=None,
         ))
 

src/bokeh/command/subcommands/serve.py

@@ -484,14 +484,14 @@ def get_login_url(request_handler):
         action  = 'store',
         default = None,
         choices = (*LOGLEVELS, 'None'),
-        help    = "One of: %s" % nice_join(LOGLEVELS),
+        help    = f"One of: {nice_join(LOGLEVELS)}",
     )),
 
     ('--log-format', Argument(
         metavar ='LOG-FORMAT',
         action  = 'store',
         default = DEFAULT_LOG_FORMAT,
-        help    = "A standard Python logging format string (default: %r)" % DEFAULT_LOG_FORMAT.replace("%", "%%"),
+        help    = f"A standard Python logging format string (default: {DEFAULT_LOG_FORMAT.replace('%', '%%')!r})",
     )),
 
     ('--log-file', Argument(
@@ -653,7 +653,7 @@ class Serve(Subcommand):
             action  = 'store',
             default = None,
             choices = SESSION_ID_MODES,
-            help    = "One of: %s" % nice_join(SESSION_ID_MODES),
+            help    = f"One of: {nice_join(SESSION_ID_MODES)}",
         )),
 
         ('--auth-module', Argument(
@@ -979,7 +979,7 @@ def show_callback() -> None:
 
                 for route in sorted(applications.keys()):
                     url = f"{protocol}://{address_string}:{server.port}{server.prefix}{route}"
-                    log.info("Bokeh app running at: %s" % url)
+                    log.info(f"Bokeh app running at: {url}")
 
                 log.info("Starting Bokeh server with process id: %d" % os.getpid())
 

src/bokeh/command/util.py

@@ -134,9 +134,9 @@ def build_single_handler_application(path: str, argv: list[str] | None = None) -
                 warn(DIRSTYLE_MAIN_WARNING)
             handler = ScriptHandler(filename=path, argv=argv)
         else:
-            raise ValueError("Expected a '.py' script or '.ipynb' notebook, got: '%s'" % path)
+            raise ValueError(f"Expected a '.py' script or '.ipynb' notebook, got: '{path}'")
     else:
-        raise ValueError("Path for Bokeh server application does not exist: %s" % path)
+        raise ValueError(f"Path for Bokeh server application does not exist: {path}")
 
     if handler.failed:
         raise RuntimeError(f"Error loading {path}:\n\n{handler.error}\n{handler.error_detail} ")
@@ -177,7 +177,7 @@ def build_single_handler_applications(paths: list[str], argvs: dict[str, list[st
 
         if not route:
             if '/' in applications:
-                raise RuntimeError("Don't know the URL path to use for %s" % (path))
+                raise RuntimeError(f"Don't know the URL path to use for {path}")
             route = '/'
         applications[route] = application
 

src/bokeh/core/property/container.py

@@ -112,7 +112,7 @@ def _is_seq(cls, value: Any) -> bool:
 
     @classmethod
     def _is_seq_like(cls, value: Any) -> bool:
-        return (isinstance(value, (Container, Sized, Iterable))
+        return (isinstance(value, Container | Sized | Iterable)
                 and hasattr(value, "__getitem__") # NOTE: this is what makes it disallow set type
                 and not isinstance(value, Mapping))
 
@@ -291,7 +291,7 @@ def __init__(self, *type_params: TypeOrInst[Property[Any]], default: Init[T] = U
     def validate(self, value: Any, detail: bool = True) -> None:
         super().validate(value, detail)
 
-        if isinstance(value, (tuple, list)) and len(self.type_params) == len(value):
+        if isinstance(value, tuple | list) and len(self.type_params) == len(value):
             if all(type_param.is_valid(item) for type_param, item in zip(self.type_params, value)):
                 return
 

src/bokeh/core/property/dataspec.py

@@ -583,7 +583,7 @@ def is_color_tuple_shape(cls, val):
             True, if the value could be a color tuple
 
         """
-        return isinstance(val, tuple) and len(val) in (3, 4) and all(isinstance(v, (float, int)) for v in val)
+        return isinstance(val, tuple) and len(val) in (3, 4) and all(isinstance(v, float | int) for v in val)
 
     def prepare_value(self, cls, name, value):
         # Some explanation is in order. We want to accept tuples like

src/bokeh/core/property/descriptors.py

@@ -484,7 +484,7 @@ def has_unstable_default(self, obj: HasProps) -> bool:
     @classmethod
     def is_unstable(cls, value: Any) -> TypeGuard[Callable[[], Any]]:
         from .instance import InstanceDefault
-        return isinstance(value, (FunctionType, InstanceDefault))
+        return isinstance(value, FunctionType | InstanceDefault)
 
     def _get(self, obj: HasProps) -> T:
         """ Internal implementation of instance attribute access for the

src/bokeh/core/property/instance.py

@@ -69,7 +69,7 @@ class Object(Property[T]):
     _instance_type: type[T] | Callable[[], type[T]] | str
 
     def __init__(self, instance_type: type[T] | Callable[[], type[T]] | str, default: Init[T] = Undefined, help: str | None = None):
-        if not (isinstance(instance_type, (type, str)) or callable(instance_type)):
+        if not (isinstance(instance_type, type | str) or callable(instance_type)):
             raise ValueError(f"expected a type, fn() -> type, or string, got {instance_type}")
 
         if isinstance(instance_type, type):

src/bokeh/core/property/visual.py

@@ -153,7 +153,7 @@ def validate(self, value: Any, detail: bool = True) -> None:
         import numpy as np
         import PIL.Image
 
-        if isinstance(value, (str, Path, PIL.Image.Image)):
+        if isinstance(value, str | Path | PIL.Image.Image):
             return
 
         if isinstance(value, np.ndarray):
@@ -174,7 +174,7 @@ def transform(self, value):
             return value
 
         # tempfile doesn't implement IO interface (https://bugs.python.org/issue33762)
-        if isinstance(value, (Path, BinaryIO, tempfile._TemporaryFileWrapper)):
+        if isinstance(value, Path | BinaryIO | tempfile._TemporaryFileWrapper):
             value = PIL.Image.open(value)
 
         if isinstance(value, PIL.Image.Image):

src/bokeh/core/property/wrappers.py

@@ -513,7 +513,7 @@ def _patch(self, doc: Document, source: ColumnarDataSource, patches, setter: Set
 
         for name, patch in patches.items():
             for ind, value in patch:
-                if isinstance(ind, (int, slice)):
+                if isinstance(ind, int | slice):
                     self[name][ind] = value
                 else:
                     shape = self[name][ind[0]][tuple(ind[1:])].shape

src/bokeh/core/serialization.py

@@ -460,7 +460,7 @@ def _encode_other(self, obj: Any) -> AnyRep:
         # avoid importing pandas here unless it is actually in use
         if uses_pandas(obj):
             import pandas as pd
-            if isinstance(obj, (pd.Series, pd.Index, pd.api.extensions.ExtensionArray)):
+            if isinstance(obj, pd.Series | pd.Index | pd.api.extensions.ExtensionArray):
                 return self._encode_ndarray(transform_series(obj))
             elif obj is pd.NA:
                 return None

src/bokeh/document/callbacks.py

@@ -174,6 +174,7 @@ def add_session_callback(self, callback_obj: SessionCallback, callback: Callback
         if doc is None:
             raise RuntimeError("Attempting to add session callback to already-destroyed Document")
 
+        actual_callback: Callback
         if one_shot:
             @wraps(callback)
             def remove_then_invoke() -> None: