From e92ff24b785c6a746e00767527c1c7c576d3c4d6 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 3 Jun 2025 17:34:35 -0400 Subject: [PATCH 1/2] Disallow blanket ignores and remove unused noqa --- pyproject.toml | 10 ++- stubs/matplotlib/backends/backend_qt.pyi | 8 +-- .../algorithms/approximation/kcomponents.pyi | 7 +- stubs/networkx/classes/digraph.pyi | 11 +-- stubs/networkx/utils/decorators.pyi | 15 +--- stubs/skimage/__init__.pyi | 2 +- stubs/skimage/data/_registry.pyi | 2 - stubs/sklearn/_build_utils/openmp_helpers.pyi | 3 - .../sklearn/decomposition/_dict_learning.pyi | 16 ----- stubs/sklearn/decomposition/_pca.pyi | 9 --- stubs/sklearn/ensemble/_base.pyi | 14 +--- stubs/sklearn/ensemble/_gb.pyi | 6 -- stubs/sklearn/linear_model/_glm/glm.pyi | 5 -- stubs/sklearn/svm/_classes.pyi | 16 ----- stubs/sklearn/utils/_estimator_html_repr.pyi | 2 +- stubs/sklearn/utils/_pprint.pyi | 6 +- stubs/sympy-stubs/assumptions/assume.pyi | 2 +- stubs/sympy-stubs/core/function.pyi | 2 +- stubs/sympy-stubs/core/kind.pyi | 2 +- stubs/sympy-stubs/polys/agca/extensions.pyi | 4 +- .../sympy-stubs/polys/domains/finitefield.pyi | 2 +- .../polys/domains/gaussiandomains.pyi | 2 +- .../sympy-stubs/polys/domains/integerring.pyi | 3 +- stubs/sympy-stubs/polys/fields.pyi | 2 +- stubs/sympy-stubs/polys/polytools.pyi | 9 ++- stubs/vispy/__init__.pyi | 9 +-- stubs/vispy/app/__init__.pyi | 15 ++-- stubs/vispy/app/application.pyi | 11 +-- stubs/vispy/app/timer.pyi | 6 +- stubs/vispy/color/__init__.pyi | 4 +- stubs/vispy/color/color_array.pyi | 17 ----- stubs/vispy/color/colormap.pyi | 9 --- stubs/vispy/geometry/__init__.pyi | 14 ++-- stubs/vispy/gloo/__init__.pyi | 16 ++--- stubs/vispy/gloo/gl/__init__.pyi | 13 +--- stubs/vispy/gloo/gl/dummy.pyi | 2 +- stubs/vispy/gloo/gl/pyopengl2.pyi | 12 +--- stubs/vispy/gloo/wrappers.pyi | 18 ++--- stubs/vispy/io/__init__.pyi | 6 +- stubs/vispy/plot/__init__.pyi | 6 +- stubs/vispy/scene/__init__.pyi | 16 ++--- stubs/vispy/scene/cameras/__init__.pyi | 14 ++-- stubs/vispy/scene/widgets/__init__.pyi | 14 ++-- stubs/vispy/testing/__init__.pyi | 4 +- stubs/vispy/util/__init__.pyi | 14 ++-- stubs/vispy/util/svg/__init__.pyi | 2 +- stubs/vispy/visuals/__init__.pyi | 72 +++++++++---------- stubs/vispy/visuals/border.pyi | 2 +- stubs/vispy/visuals/collections/__init__.pyi | 10 +-- stubs/vispy/visuals/colorbar.pyi | 4 +- stubs/vispy/visuals/filters/__init__.pyi | 10 +-- stubs/vispy/visuals/filters/mesh.pyi | 6 +- stubs/vispy/visuals/graphs/__init__.pyi | 2 +- stubs/vispy/visuals/image.pyi | 2 +- stubs/vispy/visuals/line/__init__.pyi | 4 +- stubs/vispy/visuals/shaders/__init__.pyi | 10 +-- stubs/vispy/visuals/shaders/shader_object.pyi | 10 --- stubs/vispy/visuals/text/__init__.pyi | 2 +- stubs/vispy/visuals/transforms/__init__.pyi | 10 +-- .../visuals/transforms/base_transform.pyi | 3 - stubs/vispy/visuals/volume.pyi | 4 +- 61 files changed, 183 insertions(+), 350 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 53067217..3c720bc7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,10 +56,13 @@ target-version = "py39" extend-select = [ "FA", # flake8-future-annotations "I", # isort + "PGH", # pygrep-hooks + "PGH", # pygrep-hooks and blanket-noqa + "PIE790", # unnecessary-placeholder "PYI", # flake8-pyi + "RUF", # Ruff-specific and unused-noqa "UP", # pyupgrade "W", # pycodestyle Warning - "PIE790", # unnecessary-placeholder ] ignore = [ ### @@ -82,6 +85,11 @@ ignore = [ [tool.ruff.lint.per-file-ignores] "*.pyi" = [ + # Ruff 0.8.0 added sorting of __all__ and __slots_. + # There is no consensus in typeshed on whether they want to apply this to stubs, so keeping the status quo. + # See https://github.com/python/typeshed/pull/13108 + "RUF022", # `__all__` is not sorted + "RUF023", # `{}.__slots__` is not sorted ### # Rules that are out of the control of stub authors: ### diff --git a/stubs/matplotlib/backends/backend_qt.pyi b/stubs/matplotlib/backends/backend_qt.pyi index 74801430..87ac2b12 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: ... # type: ignore - def minumumSizeHint(self) -> QtCore.QSize: ... # type: ignore + def sizeHint(self) -> QtCore.QSize: ... # type: ignore[name-defined] + def minumumSizeHint(self) -> QtCore.QSize: ... # type: ignore[name-defined] 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 = ... # type: ignore + closing: QtCore.Signal = ... # type: ignore[name-defined] 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 = ... # type: ignore + message: QtCore.Signal = ... # type: ignore[name-defined] toolitems: list = ... def __init__(self, canvas, parent=..., coordinates=...) -> None: ... def edit_parameters(self) -> None: ... diff --git a/stubs/networkx/algorithms/approximation/kcomponents.pyi b/stubs/networkx/algorithms/approximation/kcomponents.pyi index c0e0a1e2..c247a294 100644 --- a/stubs/networkx/algorithms/approximation/kcomponents.pyi +++ b/stubs/networkx/algorithms/approximation/kcomponents.pyi @@ -1,12 +1,7 @@ -import itertools -from collections import defaultdict from collections.abc import Mapping from functools import cached_property from ...classes.graph import Graph -from ...exception import NetworkXError -from ...utils import not_implemented_for -from . import local_node_connectivity __all__ = ["k_components"] @@ -17,7 +12,7 @@ class _AntiGraph(Graph): def single_edge_dict(self): ... - edge_attr_dict_factory = single_edge_dict # type: ignore + edge_attr_dict_factory = single_edge_dict def __getitem__(self, n) -> Mapping: ... def neighbors(self, n): ... diff --git a/stubs/networkx/classes/digraph.pyi b/stubs/networkx/classes/digraph.pyi index 46acef27..826b3a8f 100644 --- a/stubs/networkx/classes/digraph.pyi +++ b/stubs/networkx/classes/digraph.pyi @@ -1,12 +1,7 @@ -from copy import deepcopy from functools import cached_property -import networkx.convert as convert - -from ..classes.coreviews import AdjacencyView from ..classes.graph import Graph -from ..classes.reportviews import DiDegreeView, InDegreeView, InEdgeView, OutDegreeView, OutEdgeView -from ..exception import NetworkXError +from ..classes.reportviews import DiDegreeView, InEdgeView, OutEdgeView __all__ = ["DiGraph"] @@ -18,8 +13,8 @@ class _CachedPropertyResetterPred: class DiGraph(Graph): graph = ... - _adj = ... # type: ignore - _succ = ... # type: ignore + _adj = ... + _succ = ... _pred = ... def __init__(self, incoming_graph_data=None, **attr): ... diff --git a/stubs/networkx/utils/decorators.pyi b/stubs/networkx/utils/decorators.pyi index c5862001..c5563db7 100644 --- a/stubs/networkx/utils/decorators.pyi +++ b/stubs/networkx/utils/decorators.pyi @@ -1,19 +1,6 @@ -import bz2 -import collections -import gzip -import inspect -import itertools -import re -from collections import defaultdict from collections.abc import Sequence -from contextlib import contextmanager -from os.path import splitext -from pathlib import Path from typing import Callable -from ..classes.graph import Graph -from ..utils import create_py_random_state, create_random_state - __all__ = [ "not_implemented_for", "open_file", @@ -30,7 +17,7 @@ def not_implemented_for(*graph_types): ... # To handle new extensions, define a function accepting a `path` and `mode`. # Then add the extension to _dispatch_dict. fopeners: dict = ... -_dispatch_dict = ... # type: ignore +_dispatch_dict = ... def open_file(path_arg: str | int, mode: str = "r"): ... def nodes_or_number(which_args: str | int | Sequence[str]): ... diff --git a/stubs/skimage/__init__.pyi b/stubs/skimage/__init__.pyi index db0041fa..4920b05b 100644 --- a/stubs/skimage/__init__.pyi +++ b/stubs/skimage/__init__.pyi @@ -1,5 +1,5 @@ from ._shared import lazy as lazy -from ._shared.tester import PytestTester as PytestTester # noqa +from ._shared.tester import PytestTester as PytestTester from ._shared.version_requirements import ensure_python_version as ensure_python_version __version__: str = ... diff --git a/stubs/skimage/data/_registry.pyi b/stubs/skimage/data/_registry.pyi index 7991089c..e79d6df1 100644 --- a/stubs/skimage/data/_registry.pyi +++ b/stubs/skimage/data/_registry.pyi @@ -1,5 +1,3 @@ -# flake8: noqa - # This minimal dataset was available as part of # scikit-image 0.15 and will be retained until # further notice. diff --git a/stubs/sklearn/_build_utils/openmp_helpers.pyi b/stubs/sklearn/_build_utils/openmp_helpers.pyi index e164f531..4a4e5ccc 100644 --- a/stubs/sklearn/_build_utils/openmp_helpers.pyi +++ b/stubs/sklearn/_build_utils/openmp_helpers.pyi @@ -1,5 +1,2 @@ -# This code is adapted for a large part from the astropy openmp helpers, which -# can be found at: https://github.com/astropy/extension-helpers/blob/master/extension_helpers/_openmp_helpers.py # noqa - def get_openmp_flag(compiler): ... def check_openmp_support(): ... diff --git a/stubs/sklearn/decomposition/_dict_learning.pyi b/stubs/sklearn/decomposition/_dict_learning.pyi index 2ef8698c..0741adf2 100644 --- a/stubs/sklearn/decomposition/_dict_learning.pyi +++ b/stubs/sklearn/decomposition/_dict_learning.pyi @@ -6,14 +6,7 @@ from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..utils import ( - deprecated, -) -# Author: Vlad Niculae, Gael Varoquaux, Alexandre Gramfort -# License: BSD 3 clause - -# XXX : could be moved to the linear_model module def sparse_encode( X: ArrayLike, dictionary: MatrixLike, @@ -180,15 +173,6 @@ class MiniBatchDictionaryLearning(_BaseSparseCoding, BaseEstimator): tol: Float = 1e-3, max_no_improvement: Int = 10, ) -> None: ... - @deprecated("The attribute `iter_offset_` is deprecated in 1.1 and will be removed in 1.3.") # type: ignore - @property - def iter_offset_(self) -> int: ... - @deprecated("The attribute `random_state_` is deprecated in 1.1 and will be removed in 1.3.") # type: ignore - @property - def random_state_(self) -> RandomState: ... - @deprecated("The attribute `inner_stats_` is deprecated in 1.1 and will be removed in 1.3.") # type: ignore - @property - def inner_stats_(self) -> tuple[ndarray, ndarray]: ... def fit(self, X: MatrixLike, y: Any = None) -> Self: ... def partial_fit( self, diff --git a/stubs/sklearn/decomposition/_pca.pyi b/stubs/sklearn/decomposition/_pca.pyi index 98d182b5..25eb5631 100644 --- a/stubs/sklearn/decomposition/_pca.pyi +++ b/stubs/sklearn/decomposition/_pca.pyi @@ -5,7 +5,6 @@ from numpy import ndarray from numpy.random import RandomState from .._typing import Float, Int, MatrixLike -from ..utils.deprecation import deprecated from ._base import _BasePCA class PCA(_BasePCA): @@ -35,14 +34,6 @@ class PCA(_BasePCA): power_iteration_normalizer: Literal["auto", "QR", "LU", "none"] = "auto", random_state: RandomState | None | Int = None, ) -> None: ... - - # TODO(1.4): remove in 1.4 - # mypy error: Decorated property not supported - @deprecated( # type: ignore - "Attribute `n_features_` was deprecated in version 1.2 and will be removed in 1.4. Use `n_features_in_` instead." - ) - @property - def n_features_(self) -> int: ... def fit(self, X: MatrixLike, y: Any = None) -> Self: ... def fit_transform(self, X: MatrixLike, y: Any = None) -> ndarray: ... def score_samples(self, X: MatrixLike) -> ndarray: ... diff --git a/stubs/sklearn/ensemble/_base.pyi b/stubs/sklearn/ensemble/_base.pyi index 0e8db704..413b6db2 100644 --- a/stubs/sklearn/ensemble/_base.pyi +++ b/stubs/sklearn/ensemble/_base.pyi @@ -5,7 +5,7 @@ from typing_extensions import Self from .._typing import Int from ..base import BaseEstimator, MetaEstimatorMixin -from ..utils import Bunch, deprecated +from ..utils import Bunch from ..utils.metaestimators import _BaseComposition class BaseEnsemble(MetaEstimatorMixin, BaseEstimator, metaclass=ABCMeta): @@ -23,18 +23,6 @@ class BaseEnsemble(MetaEstimatorMixin, BaseEstimator, metaclass=ABCMeta): estimator_params: Sequence[str] = ..., base_estimator: Any = "deprecated", ) -> None: ... - - # TODO(1.4): remove - # mypy error: Decorated property not supported - @deprecated( # type: ignore - "Attribute `base_estimator_` was deprecated in version 1.2 and will be removed in 1.4. Use `estimator_` instead." - ) - @property - def base_estimator_(self) -> BaseEstimator: ... - - # TODO(1.4): remove - @property - def estimator_(self) -> BaseEstimator: ... def __len__(self) -> int: ... def __getitem__(self, index): ... def __iter__(self): ... diff --git a/stubs/sklearn/ensemble/_gb.pyi b/stubs/sklearn/ensemble/_gb.pyi index 5fea3b87..7cc9b113 100644 --- a/stubs/sklearn/ensemble/_gb.pyi +++ b/stubs/sklearn/ensemble/_gb.pyi @@ -8,7 +8,6 @@ from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassifierMixin, RegressorMixin -from ..utils import deprecated from ._base import BaseEnsemble from ._gb_losses import LossFunction @@ -57,11 +56,6 @@ class BaseGradientBoosting(BaseEnsemble, metaclass=ABCMeta): def feature_importances_(self) -> ndarray: ... def apply(self, X: MatrixLike | ArrayLike) -> ndarray: ... - # TODO(1.3): Remove - # mypy error: Decorated property not supported - @deprecated("Attribute `loss_` was deprecated in version 1.1 and will be removed in 1.3.") # type: ignore - def loss_(self): ... - class GradientBoostingClassifier(ClassifierMixin, BaseGradientBoosting): max_features_: int = ... n_classes_: int = ... diff --git a/stubs/sklearn/linear_model/_glm/glm.pyi b/stubs/sklearn/linear_model/_glm/glm.pyi index 211e24ba..4890cd2b 100644 --- a/stubs/sklearn/linear_model/_glm/glm.pyi +++ b/stubs/sklearn/linear_model/_glm/glm.pyi @@ -8,7 +8,6 @@ from ..._loss.loss import ( ) from ..._typing import ArrayLike, Float, Int, MatrixLike from ...base import BaseEstimator, RegressorMixin -from ...utils import deprecated class _GeneralizedLinearRegressor(RegressorMixin, BaseEstimator): _base_loss: BaseLoss = ... @@ -46,10 +45,6 @@ class _GeneralizedLinearRegressor(RegressorMixin, BaseEstimator): sample_weight: None | ArrayLike = None, ) -> Float: ... - # TODO(1.3): remove - @deprecated("Attribute `family` was deprecated in version 1.1 and will be removed in 1.3.") # type: ignore - def family(self): ... - class PoissonRegressor(_GeneralizedLinearRegressor): n_iter_: int = ... feature_names_in_: ndarray = ... diff --git a/stubs/sklearn/svm/_classes.pyi b/stubs/sklearn/svm/_classes.pyi index 9d54e882..0c6d3452 100644 --- a/stubs/sklearn/svm/_classes.pyi +++ b/stubs/sklearn/svm/_classes.pyi @@ -8,7 +8,6 @@ from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, OutlierMixin, RegressorMixin from ..linear_model._base import LinearClassifierMixin, LinearModel, SparseCoefMixin -from ..utils import deprecated from ._base import BaseLibSVM, BaseSVC class LinearSVC(LinearClassifierMixin, SparseCoefMixin, BaseEstimator): @@ -187,11 +186,6 @@ class SVR(RegressorMixin, BaseLibSVM): max_iter: Int = ..., ) -> None: ... - # TODO(1.4): Remove - @deprecated("Attribute `class_weight_` was deprecated in version 1.2 and will be removed in 1.4.") # type: ignore - @property - def class_weight_(self) -> ndarray: ... - class NuSVR(RegressorMixin, BaseLibSVM): support_vectors_: ndarray = ... support_: ndarray = ... @@ -225,11 +219,6 @@ class NuSVR(RegressorMixin, BaseLibSVM): max_iter: Int = ..., ) -> None: ... - # TODO(1.4): Remove - @deprecated("Attribute `class_weight_` was deprecated in version 1.2 and will be removed in 1.4.") # type: ignore - @property - def class_weight_(self) -> ndarray: ... - class OneClassSVM(OutlierMixin, BaseLibSVM): support_vectors_: ndarray = ... support_: ndarray = ... @@ -262,11 +251,6 @@ class OneClassSVM(OutlierMixin, BaseLibSVM): verbose: bool = False, max_iter: Int = ..., ) -> None: ... - - # TODO(1.4): Remove - @deprecated("Attribute `class_weight_` was deprecated in version 1.2 and will be removed in 1.4.") # type: ignore - @property - def class_weight_(self) -> ndarray: ... def fit( self, X: MatrixLike | ArrayLike, diff --git a/stubs/sklearn/utils/_estimator_html_repr.pyi b/stubs/sklearn/utils/_estimator_html_repr.pyi index 87aed00a..5e8f6363 100644 --- a/stubs/sklearn/utils/_estimator_html_repr.pyi +++ b/stubs/sklearn/utils/_estimator_html_repr.pyi @@ -21,6 +21,6 @@ class _VisualBlock: dash_wrapped: bool = True, ) -> None: ... -_STYLE = ... # noqa +_STYLE = ... def estimator_html_repr(estimator: BaseEstimator) -> str: ... diff --git a/stubs/sklearn/utils/_pprint.pyi b/stubs/sklearn/utils/_pprint.pyi index 806d5cc5..8cafe113 100644 --- a/stubs/sklearn/utils/_pprint.pyi +++ b/stubs/sklearn/utils/_pprint.pyi @@ -79,8 +79,4 @@ class _EstimatorPrettyPrinter(pprint.PrettyPrinter): ) -> None: ... def format(self, object, context: dict[Any, Any] | dict[int, int], maxlevels, level: int) -> tuple[str, bool, bool]: ... - # Note: need to copy _dispatch to prevent instances of the builtin - # PrettyPrinter class to call methods of _EstimatorPrettyPrinter (see issue - # 12906) - # mypy error: "Type[PrettyPrinter]" has no attribute "_dispatch" - _dispatch = ... # type: ignore + _dispatch = ... diff --git a/stubs/sympy-stubs/assumptions/assume.pyi b/stubs/sympy-stubs/assumptions/assume.pyi index b2daa957..f214cf89 100644 --- a/stubs/sympy-stubs/assumptions/assume.pyi +++ b/stubs/sympy-stubs/assumptions/assume.pyi @@ -24,7 +24,7 @@ class AppliedPredicate(Boolean): def binary_symbols(self) -> set[Basic] | set[Any]: ... class PredicateMeta(type): - def __new__(cls, clsname, bases, dct) -> Self: # type: ignore + def __new__(cls, clsname, bases, dct) -> Self: # pyright: ignore[reportGeneralTypeIssues] ... @property def __doc__(cls): ... diff --git a/stubs/sympy-stubs/core/function.pyi b/stubs/sympy-stubs/core/function.pyi index 27d43d46..737bf45e 100644 --- a/stubs/sympy-stubs/core/function.pyi +++ b/stubs/sympy-stubs/core/function.pyi @@ -72,7 +72,7 @@ class UndefSageHelper: _undef_sage_helper = ... class UndefinedFunction(FunctionClass): - def __new__(cls, name, bases=..., __dict__=..., **kwargs) -> Self: # type: ignore + def __new__(cls, name, bases=..., __dict__=..., **kwargs) -> Self: # pyright: ignore[reportGeneralTypeIssues] ... def __instancecheck__(cls, instance) -> bool: ... diff --git a/stubs/sympy-stubs/core/kind.pyi b/stubs/sympy-stubs/core/kind.pyi index 7bb63b59..d6a27763 100644 --- a/stubs/sympy-stubs/core/kind.pyi +++ b/stubs/sympy-stubs/core/kind.pyi @@ -4,7 +4,7 @@ from typing_extensions import LiteralString, Self from sympy.core.cache import cacheit class KindMeta(type): - def __new__(cls, clsname, bases, dct) -> Self: # type: ignore + def __new__(cls, clsname, bases, dct) -> Self: # pyright: ignore[reportGeneralTypeIssues] ... class Kind(metaclass=KindMeta): diff --git a/stubs/sympy-stubs/polys/agca/extensions.pyi b/stubs/sympy-stubs/polys/agca/extensions.pyi index 4657d6f6..95625b3a 100644 --- a/stubs/sympy-stubs/polys/agca/extensions.pyi +++ b/stubs/sympy-stubs/polys/agca/extensions.pyi @@ -11,7 +11,7 @@ if sys.version_info >= (3, 10): else: NotImplementedType: TypeAlias = Any -class ExtensionElement(DomainElement, DefaultPrinting): # type: ignore +class ExtensionElement(DomainElement, DefaultPrinting): __slots__ = ... def __init__(self, rep, ext) -> None: ... def parent(self) -> Any: ... @@ -47,7 +47,7 @@ class ExtensionElement(DomainElement, DefaultPrinting): # type: ignore ExtElem = ExtensionElement -class MonogenicFiniteExtension(Domain): # type: ignore +class MonogenicFiniteExtension(Domain): is_FiniteExtension = ... dtype = ExtensionElement def __init__(self, mod) -> None: ... diff --git a/stubs/sympy-stubs/polys/domains/finitefield.pyi b/stubs/sympy-stubs/polys/domains/finitefield.pyi index 61ef99bd..5ac23e74 100644 --- a/stubs/sympy-stubs/polys/domains/finitefield.pyi +++ b/stubs/sympy-stubs/polys/domains/finitefield.pyi @@ -5,7 +5,7 @@ from sympy.core.numbers import Integer from sympy.polys.domains.field import Field from sympy.polys.domains.simpledomain import SimpleDomain -class FiniteField(Field, SimpleDomain): # type: ignore +class FiniteField(Field, SimpleDomain): rep = ... alias = ... is_FF = ... diff --git a/stubs/sympy-stubs/polys/domains/gaussiandomains.pyi b/stubs/sympy-stubs/polys/domains/gaussiandomains.pyi index d84201c4..7fc7ee6a 100644 --- a/stubs/sympy-stubs/polys/domains/gaussiandomains.pyi +++ b/stubs/sympy-stubs/polys/domains/gaussiandomains.pyi @@ -12,7 +12,7 @@ if sys.version_info >= (3, 10): else: NotImplementedType: TypeAlias = Any -class GaussianElement(DomainElement): # type: ignore +class GaussianElement(DomainElement): base: Domain _parent: Domain __slots__ = ... diff --git a/stubs/sympy-stubs/polys/domains/integerring.pyi b/stubs/sympy-stubs/polys/domains/integerring.pyi index 197e6db1..7b1ddb1c 100644 --- a/stubs/sympy-stubs/polys/domains/integerring.pyi +++ b/stubs/sympy-stubs/polys/domains/integerring.pyi @@ -5,9 +5,8 @@ from sympy.external.gmpy import MPZ from sympy.polys.domains.characteristiczero import CharacteristicZero from sympy.polys.domains.ring import Ring from sympy.polys.domains.simpledomain import SimpleDomain -from sympy.utilities import public -class IntegerRing(Ring, CharacteristicZero, SimpleDomain): # type: ignore +class IntegerRing(Ring, CharacteristicZero, SimpleDomain): rep = ... alias = ... dtype = MPZ diff --git a/stubs/sympy-stubs/polys/fields.pyi b/stubs/sympy-stubs/polys/fields.pyi index 687df069..744b19d3 100644 --- a/stubs/sympy-stubs/polys/fields.pyi +++ b/stubs/sympy-stubs/polys/fields.pyi @@ -42,7 +42,7 @@ class FracField(DefaultPrinting): def to_domain(self) -> Any: ... def to_ring(self) -> PolyRing | Any: ... -class FracElement(DomainElement, DefaultPrinting, CantSympify): # type: ignore +class FracElement(DomainElement, DefaultPrinting, CantSympify): def __init__(self, numer, denom=...) -> None: ... def raw_new(f, numer, denom) -> Self: ... def new(f, numer, denom) -> Self: ... diff --git a/stubs/sympy-stubs/polys/polytools.pyi b/stubs/sympy-stubs/polys/polytools.pyi index a916c083..67b03afd 100644 --- a/stubs/sympy-stubs/polys/polytools.pyi +++ b/stubs/sympy-stubs/polys/polytools.pyi @@ -191,11 +191,10 @@ class Poly(Basic): ) -> tuple[ PermutationGroup | Literal[ - # Looks like a false-positives, no code to specify - S1TransitiveSubgroups.S1, # pyright: ignore - S2TransitiveSubgroups.S2, # pyright: ignore - S3TransitiveSubgroups.A3, # pyright: ignore - S3TransitiveSubgroups.S3, # pyright: ignore + S1TransitiveSubgroups.S1, + S2TransitiveSubgroups.S2, + S3TransitiveSubgroups.A3, + S3TransitiveSubgroups.S3, ] | None, bool, diff --git a/stubs/vispy/__init__.pyi b/stubs/vispy/__init__.pyi index 9b6d57a3..1d166185 100644 --- a/stubs/vispy/__init__.pyi +++ b/stubs/vispy/__init__.pyi @@ -1,11 +1,6 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. - -from __future__ import division as division - __all__ = ["use", "sys_info", "set_log_level", "test"] -from .util import config as config, keys as keys, set_log_level as set_log_level, sys_info as sys_info # noqa -from .util.wrappers import test as test, use as use # noqa +from .util import config as config, keys as keys, set_log_level as set_log_level, sys_info as sys_info +from .util.wrappers import test as test, use as use def _get_sg_image_scraper(): ... diff --git a/stubs/vispy/app/__init__.pyi b/stubs/vispy/app/__init__.pyi index 5cc4fc68..b069634b 100644 --- a/stubs/vispy/app/__init__.pyi +++ b/stubs/vispy/app/__init__.pyi @@ -1,10 +1,5 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. - -from __future__ import division as division - -from . import base as base # noqa -from ._default_app import create as create, process_events as process_events, quit as quit, run as run, use_app as use_app # noqa -from .application import Application as Application # noqa -from .canvas import Canvas as Canvas, KeyEvent as KeyEvent, MouseEvent as MouseEvent # noqa -from .timer import Timer as Timer # noqa +from . import base as base +from ._default_app import create as create, process_events as process_events, quit as quit, run as run, use_app as use_app +from .application import Application as Application +from .canvas import Canvas as Canvas, KeyEvent as KeyEvent, MouseEvent as MouseEvent +from .timer import Timer as Timer diff --git a/stubs/vispy/app/application.pyi b/stubs/vispy/app/application.pyi index 11c25bc9..c361a39b 100644 --- a/stubs/vispy/app/application.pyi +++ b/stubs/vispy/app/application.pyi @@ -1,13 +1,6 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. +from .base import BaseApplicationBackend -import builtins -import os -import sys - -from .. import config -from ..util import logger -from .base import BaseApplicationBackend as ApplicationBackend # noqa +ApplicationBackend = BaseApplicationBackend class Application: def __init__(self, backend_name: str | None = None): ... diff --git a/stubs/vispy/app/timer.pyi b/stubs/vispy/app/timer.pyi index 1d4b559e..8ed36924 100644 --- a/stubs/vispy/app/timer.pyi +++ b/stubs/vispy/app/timer.pyi @@ -1,9 +1,9 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. from typing import Any from . import Application -from .base import BaseTimerBackend as TimerBackend # noqa +from .base import BaseTimerBackend + +TimerBackend = BaseTimerBackend class Timer: def __init__(self, interval=..., connect=..., iterations=..., start=..., app=...) -> None: ... diff --git a/stubs/vispy/color/__init__.pyi b/stubs/vispy/color/__init__.pyi index 9a3b36f7..0c0de402 100644 --- a/stubs/vispy/color/__init__.pyi +++ b/stubs/vispy/color/__init__.pyi @@ -1,9 +1,9 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from ._color_dict import get_color_dict as get_color_dict, get_color_names as get_color_names # noqa +from ._color_dict import get_color_dict as get_color_dict, get_color_names as get_color_names from .color_array import Color as Color, ColorArray as ColorArray -from .colormap import ( # noqa +from .colormap import ( BaseColormap as BaseColormap, Colormap as Colormap, get_colormap as get_colormap, diff --git a/stubs/vispy/color/color_array.pyi b/stubs/vispy/color/color_array.pyi index 4eb13763..5127dc4b 100644 --- a/stubs/vispy/color/color_array.pyi +++ b/stubs/vispy/color/color_array.pyi @@ -1,23 +1,6 @@ from collections.abc import Sequence -from copy import deepcopy from typing import Literal -import numpy as np - -from ..util import logger -from ._color_dict import _color_dict -from .color_space import ( # noqa - _hex_to_rgba, - _hsv_to_rgb, - _lab_to_rgb, - _rgb_to_hex, - _rgb_to_hsv, # noqa - _rgb_to_lab, -) - -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. - ############################################################################### # User-friendliness helpers diff --git a/stubs/vispy/color/colormap.pyi b/stubs/vispy/color/colormap.pyi index 4ae8a643..09316198 100644 --- a/stubs/vispy/color/colormap.pyi +++ b/stubs/vispy/color/colormap.pyi @@ -165,15 +165,6 @@ class Diverging(Colormap): class RedYellowBlueCyan(Colormap): def __init__(self, limits: ArrayLike = ...): ... -# https://github.com/matplotlib/matplotlib/pull/4707/files#diff-893cf0348279e9f4570488a7a297ab1eR774 # noqa -# Taken from original Viridis colormap data in matplotlib implementation -# -# Issue #1331 https://github.com/vispy/vispy/issues/1331 explains that the -# 128 viridis sample size fails on some GPUs -# but lowering to 64 samples allows more GPUs to use viridis. -# -# VisPy has beem updated to use a texture map lookup. -# Thus, sampling of the Viridis colormap data is no longer necessary. _viridis_data: list = ... _colormaps = ... diff --git a/stubs/vispy/geometry/__init__.pyi b/stubs/vispy/geometry/__init__.pyi index 2f0b7874..8e7e6674 100644 --- a/stubs/vispy/geometry/__init__.pyi +++ b/stubs/vispy/geometry/__init__.pyi @@ -18,8 +18,8 @@ __all__ = [ "resize", ] -from .calculations import _calculate_normals as _calculate_normals, _fast_cross_3d as _fast_cross_3d, resize as resize # noqa -from .generation import ( # noqa +from .calculations import _calculate_normals as _calculate_normals, _fast_cross_3d as _fast_cross_3d, resize as resize +from .generation import ( create_arrow as create_arrow, create_box as create_box, create_cone as create_cone, @@ -29,8 +29,8 @@ from .generation import ( # noqa create_plane as create_plane, create_sphere as create_sphere, ) -from .meshdata import MeshData as MeshData # noqa -from .polygon import PolygonData as PolygonData # noqa -from .rect import Rect as Rect # noqa -from .torusknot import TorusKnot as TorusKnot # noqa -from .triangulation import Triangulation as Triangulation, triangulate as triangulate # noqa +from .meshdata import MeshData as MeshData +from .polygon import PolygonData as PolygonData +from .rect import Rect as Rect +from .torusknot import TorusKnot as TorusKnot +from .triangulation import Triangulation as Triangulation, triangulate as triangulate diff --git a/stubs/vispy/gloo/__init__.pyi b/stubs/vispy/gloo/__init__.pyi index db630c3f..08bbbe34 100644 --- a/stubs/vispy/gloo/__init__.pyi +++ b/stubs/vispy/gloo/__init__.pyi @@ -1,17 +1,17 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from . import gl as gl, util as util # noqa -from .buffer import IndexBuffer as IndexBuffer, VertexBuffer as VertexBuffer # noqa -from .context import ( # noqa +from . import gl as gl, util as util +from .buffer import IndexBuffer as IndexBuffer, VertexBuffer as VertexBuffer +from .context import ( GLContext as GLContext, get_current_canvas as get_current_canvas, get_default_config as get_default_config, ) -from .framebuffer import FrameBuffer as FrameBuffer, RenderBuffer as RenderBuffer # noqa -from .globject import GLObject as GLObject # noqa -from .program import Program as Program # noqa -from .texture import ( # noqa +from .framebuffer import FrameBuffer as FrameBuffer, RenderBuffer as RenderBuffer +from .globject import GLObject as GLObject +from .program import Program as Program +from .texture import ( Texture1D as Texture1D, Texture2D as Texture2D, Texture3D as Texture3D, @@ -19,4 +19,4 @@ from .texture import ( # noqa TextureCube as TextureCube, TextureEmulated3D as TextureEmulated3D, ) -from .wrappers import * # noqa +from .wrappers import * diff --git a/stubs/vispy/gloo/gl/__init__.pyi b/stubs/vispy/gloo/gl/__init__.pyi index 5221df14..dd085a55 100644 --- a/stubs/vispy/gloo/gl/__init__.pyi +++ b/stubs/vispy/gloo/gl/__init__.pyi @@ -1,15 +1,7 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. - -# NOTE: modules in this package that start with one underscore are -# autogenerated, and should not be edited. - -from __future__ import division as division - import os as os from ...util import config as config, logger as logger -from ._constants import * # noqa +from ._constants import * from ._proxy import BaseGLProxy as BaseGLProxy # Variable that will hold the module corresponding to the current backend @@ -29,6 +21,3 @@ def _arg_repr(arg): ... def make_debug_wrapper(fn): ... def check_error(when: str = "periodic check"): ... def _fix_osmesa_gl_lib_if_testing(): ... - -# Load default gl backend -from . import gl2 as default_backend # noqa diff --git a/stubs/vispy/gloo/gl/dummy.pyi b/stubs/vispy/gloo/gl/dummy.pyi index 92d26503..5c1fe06b 100644 --- a/stubs/vispy/gloo/gl/dummy.pyi +++ b/stubs/vispy/gloo/gl/dummy.pyi @@ -2,7 +2,7 @@ # Distributed under the (new) BSD License. See LICENSE.txt for more info. from . import BaseGLProxy, _copy_gl_functions -from ._constants import * # noqa +from ._constants import * class DummyProxy(BaseGLProxy): def __call__(self, funcname, returns, *args): ... diff --git a/stubs/vispy/gloo/gl/pyopengl2.pyi b/stubs/vispy/gloo/gl/pyopengl2.pyi index 398d0419..484eda3b 100644 --- a/stubs/vispy/gloo/gl/pyopengl2.pyi +++ b/stubs/vispy/gloo/gl/pyopengl2.pyi @@ -1,16 +1,6 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. - -from ...util import logger -from . import _copy_gl_functions -from ._constants import * # noqa +from ._constants import * def _patch(): ... - -# Inject - def _make_unavailable_func(funcname): ... def _get_function_from_pyopengl(funcname): ... def _inject(): ... - -from . import _pyopengl2 # noqa diff --git a/stubs/vispy/gloo/wrappers.pyi b/stubs/vispy/gloo/wrappers.pyi index cd1de955..4ff1773f 100644 --- a/stubs/vispy/gloo/wrappers.pyi +++ b/stubs/vispy/gloo/wrappers.pyi @@ -18,31 +18,31 @@ from . import gl __all__ = ( "set_viewport", "set_depth_range", - "set_front_face", # noqa + "set_front_face", "set_cull_face", "set_line_width", - "set_polygon_offset", # noqa + "set_polygon_offset", "clear", "set_clear_color", "set_clear_depth", - "set_clear_stencil", # noqa + "set_clear_stencil", "set_blend_func", "set_blend_color", - "set_blend_equation", # noqa + "set_blend_equation", "set_scissor", "set_stencil_func", - "set_stencil_mask", # noqa + "set_stencil_mask", "set_stencil_op", "set_depth_func", - "set_depth_mask", # noqa + "set_depth_mask", "set_color_mask", - "set_sample_coverage", # noqa + "set_sample_coverage", "get_state_presets", "set_state", "finish", - "flush", # noqa + "flush", "read_pixels", - "set_hint", # noqa + "set_hint", "get_gl_configuration", "_check_valid", "GL_PRESETS", diff --git a/stubs/vispy/io/__init__.pyi b/stubs/vispy/io/__init__.pyi index 4d9e41c4..a9a37b14 100644 --- a/stubs/vispy/io/__init__.pyi +++ b/stubs/vispy/io/__init__.pyi @@ -3,13 +3,13 @@ from os import path as _op -from .datasets import ( # noqa +from .datasets import ( load_crate as load_crate, load_data_file as load_data_file, load_iris as load_iris, load_spatial_filters as load_spatial_filters, ) -from .image import ( # noqa +from .image import ( _check_img_lib as _check_img_lib, _make_png as _make_png, imread as imread, @@ -17,7 +17,7 @@ from .image import ( # noqa read_png as read_png, write_png as write_png, ) -from .mesh import read_mesh as read_mesh, write_mesh as write_mesh # noqa +from .mesh import read_mesh as read_mesh, write_mesh as write_mesh _data_dir = ... diff --git a/stubs/vispy/plot/__init__.pyi b/stubs/vispy/plot/__init__.pyi index c57fbdd7..ebd27bc9 100644 --- a/stubs/vispy/plot/__init__.pyi +++ b/stubs/vispy/plot/__init__.pyi @@ -1,6 +1,6 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from ..scene import * # noqa -from .fig import Fig as Fig # noqa -from .plotwidget import PlotWidget as PlotWidget # noqa +from ..scene import * +from .fig import Fig as Fig +from .plotwidget import PlotWidget as PlotWidget diff --git a/stubs/vispy/scene/__init__.pyi b/stubs/vispy/scene/__init__.pyi index fcde669c..1486452d 100644 --- a/stubs/vispy/scene/__init__.pyi +++ b/stubs/vispy/scene/__init__.pyi @@ -1,11 +1,11 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from ..visuals import filters as filters, transforms as transforms # noqa -from ..visuals.transforms import * # noqa -from . import cameras as cameras, visuals as visuals, widgets as widgets # noqa -from .cameras import * # noqa -from .canvas import SceneCanvas as SceneCanvas # noqa -from .node import Node as Node # noqa -from .visuals import * # noqa -from .widgets import * # noqa +from ..visuals import filters as filters, transforms as transforms +from ..visuals.transforms import * +from . import cameras as cameras, visuals as visuals, widgets as widgets +from .cameras import * +from .canvas import SceneCanvas as SceneCanvas +from .node import Node as Node +from .visuals import * +from .widgets import * diff --git a/stubs/vispy/scene/cameras/__init__.pyi b/stubs/vispy/scene/cameras/__init__.pyi index 897b1816..115cfd69 100644 --- a/stubs/vispy/scene/cameras/__init__.pyi +++ b/stubs/vispy/scene/cameras/__init__.pyi @@ -10,10 +10,10 @@ __all__ = [ "TurntableCamera", ] -from ._base import make_camera as make_camera # noqa -from .arcball import ArcballCamera as ArcballCamera # noqa -from .base_camera import BaseCamera as BaseCamera # noqa -from .fly import FlyCamera as FlyCamera # noqa -from .magnify import Magnify1DCamera as Magnify1DCamera, MagnifyCamera as MagnifyCamera # noqa -from .panzoom import PanZoomCamera as PanZoomCamera # noqa -from .turntable import TurntableCamera as TurntableCamera # noqa +from ._base import make_camera as make_camera +from .arcball import ArcballCamera as ArcballCamera +from .base_camera import BaseCamera as BaseCamera +from .fly import FlyCamera as FlyCamera +from .magnify import Magnify1DCamera as Magnify1DCamera, MagnifyCamera as MagnifyCamera +from .panzoom import PanZoomCamera as PanZoomCamera +from .turntable import TurntableCamera as TurntableCamera diff --git a/stubs/vispy/scene/widgets/__init__.pyi b/stubs/vispy/scene/widgets/__init__.pyi index b83e4b46..b7d16e03 100644 --- a/stubs/vispy/scene/widgets/__init__.pyi +++ b/stubs/vispy/scene/widgets/__init__.pyi @@ -10,10 +10,10 @@ __all__ = [ "Widget", ] -from .axis import AxisWidget as AxisWidget # noqa -from .colorbar import ColorBarWidget as ColorBarWidget # noqa -from .console import Console as Console # noqa -from .grid import Grid as Grid # noqa -from .label import Label as Label # noqa -from .viewbox import ViewBox as ViewBox # noqa -from .widget import Widget as Widget # noqa +from .axis import AxisWidget as AxisWidget +from .colorbar import ColorBarWidget as ColorBarWidget +from .console import Console as Console +from .grid import Grid as Grid +from .label import Label as Label +from .viewbox import ViewBox as ViewBox +from .widget import Widget as Widget diff --git a/stubs/vispy/testing/__init__.pyi b/stubs/vispy/testing/__init__.pyi index 47023e92..b45eb00d 100644 --- a/stubs/vispy/testing/__init__.pyi +++ b/stubs/vispy/testing/__init__.pyi @@ -1,8 +1,8 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from ._runners import test as test # noqa -from ._testing import ( # noqa +from ._runners import test as test +from ._testing import ( IS_CI as IS_CI, IS_TRAVIS_CI as IS_TRAVIS_CI, SkipTest as SkipTest, diff --git a/stubs/vispy/util/__init__.pyi b/stubs/vispy/util/__init__.pyi index 225438fd..0c6c09c7 100644 --- a/stubs/vispy/util/__init__.pyi +++ b/stubs/vispy/util/__init__.pyi @@ -1,9 +1,9 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from . import fonts as fonts, transforms as transforms # noqa -from .bunch import SimpleBunch as SimpleBunch # noqa -from .config import ( # noqa +from . import fonts as fonts, transforms as transforms +from .bunch import SimpleBunch as SimpleBunch +from .config import ( _TempDir as _TempDir, config as config, get_config_keys as get_config_keys, @@ -11,7 +11,7 @@ from .config import ( # noqa set_data_dir as set_data_dir, sys_info as sys_info, ) -from .fetching import load_data_file as load_data_file # noqa -from .frozen import Frozen as Frozen # noqa -from .logs import logger as logger, set_log_level as set_log_level, use_log_level as use_log_level # noqa -from .wrappers import run_subprocess as run_subprocess, use as use # noqa +from .fetching import load_data_file as load_data_file +from .frozen import Frozen as Frozen +from .logs import logger as logger, set_log_level as set_log_level, use_log_level as use_log_level +from .wrappers import run_subprocess as run_subprocess, use as use diff --git a/stubs/vispy/util/svg/__init__.pyi b/stubs/vispy/util/svg/__init__.pyi index 66310bde..7dbe0c9f 100644 --- a/stubs/vispy/util/svg/__init__.pyi +++ b/stubs/vispy/util/svg/__init__.pyi @@ -5,7 +5,7 @@ from xml.etree import ElementTree as ElementTree from .base import namespace as namespace -from .path import Path as Path # noqa +from .path import Path as Path from .svg import SVG as SVG def Document(filename): ... diff --git a/stubs/vispy/visuals/__init__.pyi b/stubs/vispy/visuals/__init__.pyi index f8fe2f34..2f5e851e 100644 --- a/stubs/vispy/visuals/__init__.pyi +++ b/stubs/vispy/visuals/__init__.pyi @@ -1,39 +1,39 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from .axis import AxisVisual as AxisVisual # noqa -from .border import _BorderVisual as _BorderVisual # noqa -from .box import BoxVisual as BoxVisual # noqa -from .colorbar import ColorBarVisual as ColorBarVisual # noqa -from .cube import CubeVisual as CubeVisual # noqa -from .ellipse import EllipseVisual as EllipseVisual # noqa -from .graphs import GraphVisual as GraphVisual # noqa -from .gridlines import GridLinesVisual as GridLinesVisual # noqa -from .gridmesh import GridMeshVisual as GridMeshVisual # noqa -from .histogram import HistogramVisual as HistogramVisual # noqa -from .image import ImageVisual as ImageVisual # noqa -from .image_complex import ComplexImageVisual as ComplexImageVisual # noqa -from .infinite_line import InfiniteLineVisual as InfiniteLineVisual # noqa -from .isocurve import IsocurveVisual as IsocurveVisual # noqa -from .isoline import IsolineVisual as IsolineVisual # noqa -from .isosurface import IsosurfaceVisual as IsosurfaceVisual # noqa -from .line import ArrowVisual as ArrowVisual, LineVisual as LineVisual # noqa -from .line_plot import LinePlotVisual as LinePlotVisual # noqa -from .linear_region import LinearRegionVisual as LinearRegionVisual # noqa -from .markers import MarkersVisual as MarkersVisual # noqa -from .mesh import MeshVisual as MeshVisual # noqa -from .mesh_normals import MeshNormalsVisual as MeshNormalsVisual # noqa -from .plane import PlaneVisual as PlaneVisual # noqa -from .polygon import PolygonVisual as PolygonVisual # noqa -from .rectangle import RectangleVisual as RectangleVisual # noqa -from .regular_polygon import RegularPolygonVisual as RegularPolygonVisual # noqa -from .scrolling_lines import ScrollingLinesVisual as ScrollingLinesVisual # noqa -from .spectrogram import SpectrogramVisual as SpectrogramVisual # noqa -from .sphere import SphereVisual as SphereVisual # noqa -from .surface_plot import SurfacePlotVisual as SurfacePlotVisual # noqa -from .text import TextVisual as TextVisual # noqa -from .tube import TubeVisual as TubeVisual # noqa -from .visual import BaseVisual as BaseVisual, CompoundVisual as CompoundVisual, Visual as Visual # noqa -from .volume import VolumeVisual as VolumeVisual # noqa -from .windbarb import WindbarbVisual as WindbarbVisual # noqa -from .xyz_axis import XYZAxisVisual as XYZAxisVisual # noqa +from .axis import AxisVisual as AxisVisual +from .border import _BorderVisual as _BorderVisual +from .box import BoxVisual as BoxVisual +from .colorbar import ColorBarVisual as ColorBarVisual +from .cube import CubeVisual as CubeVisual +from .ellipse import EllipseVisual as EllipseVisual +from .graphs import GraphVisual as GraphVisual +from .gridlines import GridLinesVisual as GridLinesVisual +from .gridmesh import GridMeshVisual as GridMeshVisual +from .histogram import HistogramVisual as HistogramVisual +from .image import ImageVisual as ImageVisual +from .image_complex import ComplexImageVisual as ComplexImageVisual +from .infinite_line import InfiniteLineVisual as InfiniteLineVisual +from .isocurve import IsocurveVisual as IsocurveVisual +from .isoline import IsolineVisual as IsolineVisual +from .isosurface import IsosurfaceVisual as IsosurfaceVisual +from .line import ArrowVisual as ArrowVisual, LineVisual as LineVisual +from .line_plot import LinePlotVisual as LinePlotVisual +from .linear_region import LinearRegionVisual as LinearRegionVisual +from .markers import MarkersVisual as MarkersVisual +from .mesh import MeshVisual as MeshVisual +from .mesh_normals import MeshNormalsVisual as MeshNormalsVisual +from .plane import PlaneVisual as PlaneVisual +from .polygon import PolygonVisual as PolygonVisual +from .rectangle import RectangleVisual as RectangleVisual +from .regular_polygon import RegularPolygonVisual as RegularPolygonVisual +from .scrolling_lines import ScrollingLinesVisual as ScrollingLinesVisual +from .spectrogram import SpectrogramVisual as SpectrogramVisual +from .sphere import SphereVisual as SphereVisual +from .surface_plot import SurfacePlotVisual as SurfacePlotVisual +from .text import TextVisual as TextVisual +from .tube import TubeVisual as TubeVisual +from .visual import BaseVisual as BaseVisual, CompoundVisual as CompoundVisual, Visual as Visual +from .volume import VolumeVisual as VolumeVisual +from .windbarb import WindbarbVisual as WindbarbVisual +from .xyz_axis import XYZAxisVisual as XYZAxisVisual diff --git a/stubs/vispy/visuals/border.pyi b/stubs/vispy/visuals/border.pyi index 0596b260..553c5130 100644 --- a/stubs/vispy/visuals/border.pyi +++ b/stubs/vispy/visuals/border.pyi @@ -12,7 +12,7 @@ from . import Visual _VERTEX_SHADER: str = ... -_FRAGMENT_SHADER: str = ... # noqa +_FRAGMENT_SHADER: str = ... class _BorderVisual(Visual): _shaders: dict = ... diff --git a/stubs/vispy/visuals/collections/__init__.pyi b/stubs/vispy/visuals/collections/__init__.pyi index 2d4e0ef5..7a051a03 100644 --- a/stubs/vispy/visuals/collections/__init__.pyi +++ b/stubs/vispy/visuals/collections/__init__.pyi @@ -3,8 +3,8 @@ # Distributed under the (new) BSD License. See LICENSE.txt for more info. # ----------------------------------------------------------------------------- -from .path_collection import PathCollection as PathCollection # noqa -from .point_collection import PointCollection as PointCollection # noqa -from .polygon_collection import PolygonCollection as PolygonCollection # noqa -from .segment_collection import SegmentCollection as SegmentCollection # noqa -from .triangle_collection import TriangleCollection as TriangleCollection # noqa +from .path_collection import PathCollection as PathCollection +from .point_collection import PointCollection as PointCollection +from .polygon_collection import PolygonCollection as PolygonCollection +from .segment_collection import SegmentCollection as SegmentCollection +from .triangle_collection import TriangleCollection as TriangleCollection diff --git a/stubs/vispy/visuals/colorbar.pyi b/stubs/vispy/visuals/colorbar.pyi index c03d85cd..214406ca 100644 --- a/stubs/vispy/visuals/colorbar.pyi +++ b/stubs/vispy/visuals/colorbar.pyi @@ -15,9 +15,9 @@ from . import CompoundVisual, TextVisual, Visual, _BorderVisual # from .border import _BorderVisual from .shaders import Function -_VERTEX_SHADER: str = ... # noqa +_VERTEX_SHADER: str = ... -_FRAGMENT_SHADER: str = ... # noqa +_FRAGMENT_SHADER: str = ... class _CoreColorBarVisual(Visual): _shaders: dict = ... diff --git a/stubs/vispy/visuals/filters/__init__.pyi b/stubs/vispy/visuals/filters/__init__.pyi index 09640781..e73e9d9c 100644 --- a/stubs/vispy/visuals/filters/__init__.pyi +++ b/stubs/vispy/visuals/filters/__init__.pyi @@ -1,13 +1,13 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from .base_filter import Filter as Filter # noqa -from .clipper import Clipper as Clipper # noqa -from .color import ( # noqa +from .base_filter import Filter as Filter +from .clipper import Clipper as Clipper +from .color import ( Alpha as Alpha, ColorFilter as ColorFilter, IsolineFilter as IsolineFilter, ZColormapFilter as ZColormapFilter, ) -from .mesh import ShadingFilter as ShadingFilter, TextureFilter as TextureFilter, WireframeFilter as WireframeFilter # noqa -from .picking import PickingFilter as PickingFilter # noqa +from .mesh import ShadingFilter as ShadingFilter, TextureFilter as TextureFilter, WireframeFilter as WireframeFilter +from .picking import PickingFilter as PickingFilter diff --git a/stubs/vispy/visuals/filters/mesh.pyi b/stubs/vispy/visuals/filters/mesh.pyi index aea704f2..2cf21c54 100644 --- a/stubs/vispy/visuals/filters/mesh.pyi +++ b/stubs/vispy/visuals/filters/mesh.pyi @@ -27,7 +27,7 @@ class TextureFilter(Filter): shading_vertex_template: str = ... -shading_fragment_template: str = ... # noqa +shading_fragment_template: str = ... def _as_rgba(intensity_or_color, default_rgb=(1.0, 1.0, 1.0)): ... @@ -90,9 +90,9 @@ class ShadingFilter(Filter): def _attach(self, visual): ... def _detach(self, visual): ... -wireframe_vertex_template: str = ... # noqa +wireframe_vertex_template: str = ... -wireframe_fragment_template: str = ... # noqa +wireframe_fragment_template: str = ... class WireframeFilter(Filter): def __init__( diff --git a/stubs/vispy/visuals/graphs/__init__.pyi b/stubs/vispy/visuals/graphs/__init__.pyi index f682b10d..9aaf7c06 100644 --- a/stubs/vispy/visuals/graphs/__init__.pyi +++ b/stubs/vispy/visuals/graphs/__init__.pyi @@ -1 +1 @@ -from .graph import GraphVisual as GraphVisual # noqa +from .graph import GraphVisual as GraphVisual diff --git a/stubs/vispy/visuals/image.pyi b/stubs/vispy/visuals/image.pyi index 7db42402..37ea898d 100644 --- a/stubs/vispy/visuals/image.pyi +++ b/stubs/vispy/visuals/image.pyi @@ -16,7 +16,7 @@ from .visual import Visual _VERTEX_SHADER: str = ... -_FRAGMENT_SHADER: str = ... # noqa +_FRAGMENT_SHADER: str = ... _INTERPOLATION_TEMPLATE: str = ... diff --git a/stubs/vispy/visuals/line/__init__.pyi b/stubs/vispy/visuals/line/__init__.pyi index c1b70f31..33cf0bea 100644 --- a/stubs/vispy/visuals/line/__init__.pyi +++ b/stubs/vispy/visuals/line/__init__.pyi @@ -1,5 +1,5 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from .arrow import ArrowVisual as ArrowVisual # noqa -from .line import LineVisual as LineVisual # noqa +from .arrow import ArrowVisual as ArrowVisual +from .line import LineVisual as LineVisual diff --git a/stubs/vispy/visuals/shaders/__init__.pyi b/stubs/vispy/visuals/shaders/__init__.pyi index 26609656..6e62cd2a 100644 --- a/stubs/vispy/visuals/shaders/__init__.pyi +++ b/stubs/vispy/visuals/shaders/__init__.pyi @@ -12,13 +12,13 @@ __all__ = [ "MultiProgram", ] -from .compiler import Compiler as Compiler # noqa -from .function import ( # noqa +from .compiler import Compiler as Compiler +from .function import ( Function as Function, FunctionChain as FunctionChain, MainFunction as MainFunction, StatementList as StatementList, ) -from .multiprogram import MultiProgram as MultiProgram # noqa -from .program import ModularProgram as ModularProgram # noqa -from .variable import Variable as Variable, Varying as Varying # noqa +from .multiprogram import MultiProgram as MultiProgram +from .program import ModularProgram as ModularProgram +from .variable import Variable as Variable, Varying as Varying diff --git a/stubs/vispy/visuals/shaders/shader_object.pyi b/stubs/vispy/visuals/shaders/shader_object.pyi index 18b76e82..389c9e09 100644 --- a/stubs/vispy/visuals/shaders/shader_object.pyi +++ b/stubs/vispy/visuals/shaders/shader_object.pyi @@ -1,10 +1,3 @@ -# Copyright (c) Vispy Development Team. All Rights Reserved. -# Distributed under the (new) BSD License. See LICENSE.txt for more info. -from collections import OrderedDict -from weakref import WeakKeyDictionary - -from .compiler import Compiler - class ShaderObject: @classmethod def create(cls, obj, ref=None): ... @@ -23,6 +16,3 @@ class ShaderObject: def changed(self, code_changed=False, value_changed=False): ... def compile(self): ... def __repr__(self): ... - -from .expression import TextExpression # noqa -from .variable import Variable # noqa diff --git a/stubs/vispy/visuals/text/__init__.pyi b/stubs/vispy/visuals/text/__init__.pyi index 314437df..38893186 100644 --- a/stubs/vispy/visuals/text/__init__.pyi +++ b/stubs/vispy/visuals/text/__init__.pyi @@ -3,4 +3,4 @@ # Distributed under the (new) BSD License. See LICENSE.txt for more info. # ----------------------------------------------------------------------------- -from .text import TextVisual as TextVisual # noqa +from .text import TextVisual as TextVisual diff --git a/stubs/vispy/visuals/transforms/__init__.pyi b/stubs/vispy/visuals/transforms/__init__.pyi index 67d7693e..1b0cfabe 100644 --- a/stubs/vispy/visuals/transforms/__init__.pyi +++ b/stubs/vispy/visuals/transforms/__init__.pyi @@ -1,17 +1,17 @@ # Copyright (c) Vispy Development Team. All Rights Reserved. # Distributed under the (new) BSD License. See LICENSE.txt for more info. -from ._util import ( # noqa +from ._util import ( TransformCache as TransformCache, arg_to_array as arg_to_array, arg_to_vec4 as arg_to_vec4, as_vec4 as as_vec4, ) -from .base_transform import BaseTransform as BaseTransform # noqa -from .chain import ChainTransform as ChainTransform # noqa +from .base_transform import BaseTransform as BaseTransform +from .chain import ChainTransform as ChainTransform from .interactive import PanZoomTransform as PanZoomTransform -from .linear import MatrixTransform as MatrixTransform, NullTransform as NullTransform, STTransform as STTransform # noqa -from .nonlinear import LogTransform as LogTransform, PolarTransform as PolarTransform # noqa +from .linear import MatrixTransform as MatrixTransform, NullTransform as NullTransform, STTransform as STTransform +from .nonlinear import LogTransform as LogTransform, PolarTransform as PolarTransform from .transform_system import TransformSystem as TransformSystem __all__ = [ diff --git a/stubs/vispy/visuals/transforms/base_transform.pyi b/stubs/vispy/visuals/transforms/base_transform.pyi index 4e573f95..5b852f44 100644 --- a/stubs/vispy/visuals/transforms/base_transform.pyi +++ b/stubs/vispy/visuals/transforms/base_transform.pyi @@ -60,6 +60,3 @@ class InverseTransform(BaseTransform): @property def shader_imap(self): ... def __repr__(self): ... - -# import here to avoid import cycle; needed for BaseTransform.__mul__. -from .chain import ChainTransform # noqa diff --git a/stubs/vispy/visuals/volume.pyi b/stubs/vispy/visuals/volume.pyi index fc119886..2c18c5ac 100644 --- a/stubs/vispy/visuals/volume.pyi +++ b/stubs/vispy/visuals/volume.pyi @@ -6,9 +6,9 @@ from numpy.typing import ArrayLike, NDArray from . import Visual -_VERTEX_SHADER: str = ... # noqa +_VERTEX_SHADER: str = ... -_FRAGMENT_SHADER: str = ... # noqa +_FRAGMENT_SHADER: str = ... _RAYCASTING_SETUP_VOLUME: str = ... From 2b3a76f2a9419b9d9a21ee78d94a7d1ba983eba5 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 3 Jun 2025 17:48:43 -0400 Subject: [PATCH 2/2] Remove solved stubtest entries --- stubs/sklearn/stubtest_allowlist.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/stubs/sklearn/stubtest_allowlist.txt b/stubs/sklearn/stubtest_allowlist.txt index 29ab5207..ddd11c35 100644 --- a/stubs/sklearn/stubtest_allowlist.txt +++ b/stubs/sklearn/stubtest_allowlist.txt @@ -1623,21 +1623,14 @@ sklearn.decomposition.FastICA.__init__ sklearn.decomposition.LatentDirichletAllocation.fit_transform sklearn.decomposition.LatentDirichletAllocation.transform sklearn.decomposition.MiniBatchDictionaryLearning.__init__ -sklearn.decomposition.MiniBatchDictionaryLearning.inner_stats_ -sklearn.decomposition.MiniBatchDictionaryLearning.iter_offset_ sklearn.decomposition.MiniBatchDictionaryLearning.partial_fit -sklearn.decomposition.MiniBatchDictionaryLearning.random_state_ sklearn.decomposition.MiniBatchNMF.__init__ sklearn.decomposition.MiniBatchSparsePCA.__init__ sklearn.decomposition.NMF.__init__ -sklearn.decomposition.PCA.n_features_ sklearn.decomposition._dict_learning.DictionaryLearning.__init__ sklearn.decomposition._dict_learning.DictionaryLearning.fit_transform sklearn.decomposition._dict_learning.MiniBatchDictionaryLearning.__init__ -sklearn.decomposition._dict_learning.MiniBatchDictionaryLearning.inner_stats_ -sklearn.decomposition._dict_learning.MiniBatchDictionaryLearning.iter_offset_ sklearn.decomposition._dict_learning.MiniBatchDictionaryLearning.partial_fit -sklearn.decomposition._dict_learning.MiniBatchDictionaryLearning.random_state_ sklearn.decomposition._dict_learning.dict_learning_online sklearn.decomposition._fastica.FastICA.__init__ sklearn.decomposition._fastica.fastica @@ -1650,7 +1643,6 @@ sklearn.decomposition._nmf._BaseNMF.__init__ sklearn.decomposition._nmf._BaseNMF.inverse_transform sklearn.decomposition._nmf.non_negative_factorization sklearn.decomposition._online_lda_fast.psi -sklearn.decomposition._pca.PCA.n_features_ sklearn.decomposition._sparse_pca.MiniBatchSparsePCA.__init__ sklearn.decomposition.dict_learning_online sklearn.decomposition.fastica @@ -1666,8 +1658,6 @@ sklearn.ensemble.BaggingClassifier.estimators_samples_ sklearn.ensemble.BaggingRegressor.__init__ sklearn.ensemble.BaggingRegressor.estimators_samples_ sklearn.ensemble.BaseEnsemble.__init__ -sklearn.ensemble.BaseEnsemble.base_estimator_ -sklearn.ensemble.BaseEnsemble.estimator_ sklearn.ensemble.ExtraTreesClassifier.__init__ sklearn.ensemble.ExtraTreesClassifier.feature_importances_ sklearn.ensemble.ExtraTreesRegressor.__init__ @@ -1702,8 +1692,6 @@ sklearn.ensemble._bagging.BaseBagging.estimators_samples_ sklearn.ensemble._bagging.BaseBagging.fit sklearn.ensemble._bagging.MAX_INT sklearn.ensemble._base.BaseEnsemble.__init__ -sklearn.ensemble._base.BaseEnsemble.base_estimator_ -sklearn.ensemble._base.BaseEnsemble.estimator_ sklearn.ensemble._forest.BaseForest.__init__ sklearn.ensemble._forest.ExtraTreesClassifier.__init__ sklearn.ensemble._forest.ExtraTreesClassifier.feature_importances_ @@ -1717,7 +1705,6 @@ sklearn.ensemble._forest.RandomForestClassifier.feature_importances_ sklearn.ensemble._forest.RandomForestRegressor.__init__ sklearn.ensemble._forest.RandomForestRegressor.feature_importances_ sklearn.ensemble._forest.RandomTreesEmbedding.feature_importances_ -sklearn.ensemble._gb.BaseGradientBoosting.loss_ sklearn.ensemble._gb.GradientBoostingClassifier.feature_importances_ sklearn.ensemble._gb.GradientBoostingRegressor.feature_importances_ sklearn.ensemble._gb_losses @@ -1912,8 +1899,6 @@ sklearn.linear_model._coordinate_descent.MultiTaskElasticNet.sparse_coef_ sklearn.linear_model._coordinate_descent.MultiTaskElasticNetCV.path sklearn.linear_model._coordinate_descent.MultiTaskLasso.sparse_coef_ sklearn.linear_model._coordinate_descent.MultiTaskLassoCV.path -sklearn.linear_model._glm._GeneralizedLinearRegressor.family -sklearn.linear_model._glm.glm._GeneralizedLinearRegressor.family sklearn.linear_model._least_angle.Lars.__init__ sklearn.linear_model._least_angle.LarsCV.__init__ sklearn.linear_model._least_angle.LassoLars.__init__ @@ -2158,17 +2143,14 @@ sklearn.svm.NuSVC.coef_ sklearn.svm.NuSVC.n_support_ sklearn.svm.NuSVC.probA_ sklearn.svm.NuSVC.probB_ -sklearn.svm.NuSVR.class_weight_ sklearn.svm.NuSVR.coef_ sklearn.svm.NuSVR.n_support_ -sklearn.svm.OneClassSVM.class_weight_ sklearn.svm.OneClassSVM.coef_ sklearn.svm.OneClassSVM.n_support_ sklearn.svm.SVC.coef_ sklearn.svm.SVC.n_support_ sklearn.svm.SVC.probA_ sklearn.svm.SVC.probB_ -sklearn.svm.SVR.class_weight_ sklearn.svm.SVR.coef_ sklearn.svm.SVR.n_support_ sklearn.svm._base.BaseLibSVM.n_support_ @@ -2178,17 +2160,14 @@ sklearn.svm._classes.NuSVC.coef_ sklearn.svm._classes.NuSVC.n_support_ sklearn.svm._classes.NuSVC.probA_ sklearn.svm._classes.NuSVC.probB_ -sklearn.svm._classes.NuSVR.class_weight_ sklearn.svm._classes.NuSVR.coef_ sklearn.svm._classes.NuSVR.n_support_ -sklearn.svm._classes.OneClassSVM.class_weight_ sklearn.svm._classes.OneClassSVM.coef_ sklearn.svm._classes.OneClassSVM.n_support_ sklearn.svm._classes.SVC.coef_ sklearn.svm._classes.SVC.n_support_ sklearn.svm._classes.SVC.probA_ sklearn.svm._classes.SVC.probB_ -sklearn.svm._classes.SVR.class_weight_ sklearn.svm._classes.SVR.coef_ sklearn.svm._classes.SVR.n_support_ sklearn.tests.random_seed