fixes for mypy 1.11 (#13989)

bokeh · Jul 25, 2024 · bb7d2bf · bb7d2bf
1 parent e69f5ac
commit bb7d2bf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/conda/environment-test-3.10.yml b/conda/environment-test-3.10.yml
@@ -63,7 +63,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.10
+    - mypy >=1.11
     # docs
     - bokeh_sampledata
     - pydata_sphinx_theme

diff --git a/conda/environment-test-3.11.yml b/conda/environment-test-3.11.yml
@@ -63,7 +63,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.10
+    - mypy >=1.11
     # docs
     - bokeh_sampledata
     - pydata_sphinx_theme

diff --git a/conda/environment-test-3.12.yml b/conda/environment-test-3.12.yml
@@ -63,7 +63,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.10
+    - mypy >=1.11
     # docs
     - bokeh_sampledata
     - pydata_sphinx_theme

diff --git a/conda/environment-test-minimal-deps.yml b/conda/environment-test-minimal-deps.yml
@@ -53,7 +53,7 @@ dependencies:
   # pip dependencies
   - pip
   - pip:
-    - mypy >=1.10
+    - mypy >=1.11
     # docs
     # omit bokeh_sampledata
     - pydata_sphinx_theme

diff --git a/src/bokeh/driving.py b/src/bokeh/driving.py
@@ -50,7 +50,6 @@ def update(i):
 from typing import (
     Any,
     Callable,
-    Iterable,
     Iterator,
     Sequence,
     TypeVar,
@@ -200,7 +199,7 @@ def f(i: float) -> float:
 
 T = TypeVar("T")
 
-def _advance(f: Callable[[int], T]) -> Iterable[T]:
+def _advance(f: Callable[[int], T]) -> Iterator[T]:
     ''' Yield a sequence generated by calling a given function with
     successively incremented integer values.
 

diff --git a/src/bokeh/embed/standalone.py b/src/bokeh/embed/standalone.py
@@ -133,21 +133,21 @@ def autoload_static(model: Model | Document, resources: Resources, script_path:
     return js, tag
 
 @overload
-def components(models: Model, wrap_script: bool = ..., # type: ignore[overload-overlap] # XXX: mypy bug
+def components(models: Model, wrap_script: bool = ...,
     wrap_plot_info: Literal[True] = ..., theme: ThemeLike = ...) -> tuple[str, str]: ...
 @overload
 def components(models: Model, wrap_script: bool = ..., wrap_plot_info: Literal[False] = ...,
     theme: ThemeLike = ...) -> tuple[str, RenderRoot]: ...
 
 @overload
-def components(models: Sequence[Model], wrap_script: bool = ..., # type: ignore[overload-overlap] # XXX: mypy bug
+def components(models: Sequence[Model], wrap_script: bool = ...,
     wrap_plot_info: Literal[True] = ..., theme: ThemeLike = ...) -> tuple[str, Sequence[str]]: ...
 @overload
 def components(models: Sequence[Model], wrap_script: bool = ..., wrap_plot_info: Literal[False] = ...,
     theme: ThemeLike = ...) -> tuple[str, Sequence[RenderRoot]]: ...
 
 @overload
-def components(models: dict[str, Model], wrap_script: bool = ..., # type: ignore[overload-overlap] # XXX: mypy bug
+def components(models: dict[str, Model], wrap_script: bool = ...,
     wrap_plot_info: Literal[True] = ..., theme: ThemeLike = ...) -> tuple[str, dict[str, str]]: ...
 @overload
 def components(models: dict[str, Model], wrap_script: bool = ..., wrap_plot_info: Literal[False] = ...,