From 3f1468dc25255bdab630b736bf456c50d4d075d1 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Wed, 22 Jan 2025 11:11:55 -0500 Subject: [PATCH 1/4] fix: Add n_targets argument to GaussianProcessRegressor() --- stubs/sklearn/gaussian_process/_gpr.pyi | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/sklearn/gaussian_process/_gpr.pyi b/stubs/sklearn/gaussian_process/_gpr.pyi index c1e2ef3f..db27248a 100644 --- a/stubs/sklearn/gaussian_process/_gpr.pyi +++ b/stubs/sklearn/gaussian_process/_gpr.pyi @@ -46,6 +46,7 @@ class GaussianProcessRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator): n_restarts_optimizer: Int = 0, normalize_y: bool = False, copy_X_train: bool = True, + n_targets: Int | None = None, random_state: RandomState | None | Int = None, ) -> None: ... def fit( From bca5384ef287cb22ab2cf8532dc5e71872b2ce05 Mon Sep 17 00:00:00 2001 From: Erik De Bonte Date: Wed, 22 Jan 2025 10:57:04 -0800 Subject: [PATCH 2/4] ruff format --- stubs/sympy-stubs/plotting/pygletplot/util.pyi | 12 +++++------- .../polys/numberfields/galois_resolvents.pyi | 18 ++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/stubs/sympy-stubs/plotting/pygletplot/util.pyi b/stubs/sympy-stubs/plotting/pygletplot/util.pyi index 946c9657..9cb51157 100644 --- a/stubs/sympy-stubs/plotting/pygletplot/util.pyi +++ b/stubs/sympy-stubs/plotting/pygletplot/util.pyi @@ -6,13 +6,11 @@ def get_projection_matrix(array_type=..., glGetMethod=...) -> Array[c_float]: .. def get_viewport() -> Array[c_int]: ... def get_direction_vectors() -> tuple[tuple[Any, Any, Any], tuple[Any, Any, Any], tuple[Any, Any, Any]]: ... def get_view_direction_vectors() -> tuple[tuple[Any, Any, Any], tuple[Any, Any, Any], tuple[Any, Any, Any]]: ... -def get_basis_vectors() -> ( - tuple[ - tuple[Literal[1], Literal[0], Literal[0]], - tuple[Literal[0], Literal[1], Literal[0]], - tuple[Literal[0], Literal[0], Literal[1]], - ] -): ... +def get_basis_vectors() -> tuple[ + tuple[Literal[1], Literal[0], Literal[0]], + tuple[Literal[0], Literal[1], Literal[0]], + tuple[Literal[0], Literal[0], Literal[1]], +]: ... def screen_to_model(x, y, z) -> tuple[float, float, float]: ... def model_to_screen(x, y, z) -> tuple[float, float, float]: ... def vec_subs(a, b) -> tuple[Any, ...]: ... diff --git a/stubs/sympy-stubs/polys/numberfields/galois_resolvents.pyi b/stubs/sympy-stubs/polys/numberfields/galois_resolvents.pyi index b71009dc..0232517f 100644 --- a/stubs/sympy-stubs/polys/numberfields/galois_resolvents.pyi +++ b/stubs/sympy-stubs/polys/numberfields/galois_resolvents.pyi @@ -16,16 +16,14 @@ class Resolvent: def wrap(text, width=...) -> LiteralString | Literal[""]: ... def s_vars(n) -> Any: ... def sparse_symmetrize_resolvent_coeffs(F, X, s, verbose=...) -> tuple[list[Any], list[Any]]: ... -def define_resolvents() -> ( - dict[ - tuple[Literal[4], Literal[0]] - | tuple[Literal[4], Literal[1]] - | tuple[Literal[5], Literal[1]] - | tuple[Literal[6], Literal[1]] - | tuple[Literal[6], Literal[2]], - Any, - ] -): ... +def define_resolvents() -> dict[ + tuple[Literal[4], Literal[0]] + | tuple[Literal[4], Literal[1]] + | tuple[Literal[5], Literal[1]] + | tuple[Literal[6], Literal[1]] + | tuple[Literal[6], Literal[2]], + Any, +]: ... def generate_lambda_lookup(verbose=..., trial_run=...) -> str: ... def get_resolvent_by_lookup(T, number) -> list[Any]: ... From 16fa25914d959b7f6ab974ef6f07f7c69f544c4c Mon Sep 17 00:00:00 2001 From: Erik De Bonte Date: Wed, 22 Jan 2025 14:46:06 -0800 Subject: [PATCH 3/4] ClassVar is not allowed within NamedTuples --- stubs/sklearn/utils/_encode.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/sklearn/utils/_encode.pyi b/stubs/sklearn/utils/_encode.pyi index 923b4020..592ca1af 100644 --- a/stubs/sklearn/utils/_encode.pyi +++ b/stubs/sklearn/utils/_encode.pyi @@ -8,8 +8,8 @@ from numpy import ndarray, str_ from . import is_scalar_nan as is_scalar_nan class MissingValues(NamedTuple): - nan: ClassVar[bool] = ... - none: ClassVar[bool] = ... + nan: bool = ... + none: bool = ... def to_list(self) -> list[float | Any]: ... From b490a2d317df5b5224686b07db5200b56e238b5b Mon Sep 17 00:00:00 2001 From: Erik De Bonte Date: Wed, 22 Jan 2025 15:02:16 -0800 Subject: [PATCH 4/4] Suppress pyright errors about QtCore members --- stubs/matplotlib/backends/backend_qt.pyi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stubs/matplotlib/backends/backend_qt.pyi b/stubs/matplotlib/backends/backend_qt.pyi index 39038e08..01bdcf81 100644 --- a/stubs/matplotlib/backends/backend_qt.pyi +++ b/stubs/matplotlib/backends/backend_qt.pyi @@ -47,8 +47,8 @@ class FigureCanvasQT(QtWidgets.QWidget, FigureCanvasBase): def keyPressEvent(self, event) -> None: ... def keyReleaseEvent(self, event) -> None: ... def resizeEvent(self, event) -> None: ... - def sizeHint(self) -> QtCore.QSize: ... - def minumumSizeHint(self) -> QtCore.QSize: ... + def sizeHint(self) -> QtCore.QSize: ... # type: ignore + def minumumSizeHint(self) -> QtCore.QSize: ... # type: ignore def flush_events(self) -> None: ... def start_event_loop(self, timeout=...) -> None: ... def stop_event_loop(self, event=...) -> None: ... @@ -58,7 +58,7 @@ class FigureCanvasQT(QtWidgets.QWidget, FigureCanvasBase): def drawRectangle(self, rect) -> None: ... class MainWindow(QtWidgets.QMainWindow): - closing: QtCore.Signal = ... + closing: QtCore.Signal = ... # type: ignore def closeEvent(self, event) -> None: ... class FigureManagerQT(FigureManagerBase): @@ -71,7 +71,7 @@ class FigureManagerQT(FigureManagerBase): def set_window_title(self, title) -> None: ... class NavigationToolbar2QT(NavigationToolbar2, QtWidgets.QToolBar): - message: QtCore.Signal = ... + message: QtCore.Signal = ... # type: ignore toolitems: list = ... def __init__(self, canvas, parent=..., coordinates=...) -> None: ... def edit_parameters(self) -> None: ...