diff --git a/.gitignore b/.gitignore index df9a0eda..a8baadfa 100644 --- a/.gitignore +++ b/.gitignore @@ -357,6 +357,9 @@ MigrationBackup/ # Python virtual environment .venv +# Lock files (like uv.lock) +*.lock + # Build files from utils .eggs *.egg-info diff --git a/pyproject.toml b/pyproject.toml index a68a00ae..7c84abc6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,7 @@ extra-standard-library = [ ] [tool.pyright] -exclude = ["build", ".git"] +exclude = ["build", ".git", ".venv*"] stubPath = "./stubs" pythonversion = "3.9" # Target oldest supported Python version typeCheckingMode = "standard" diff --git a/stubs/skimage/_shared/coord.pyi b/stubs/skimage/_shared/coord.pyi index 4fb6bb13..b3ebce20 100644 --- a/stubs/skimage/_shared/coord.pyi +++ b/stubs/skimage/_shared/coord.pyi @@ -1,6 +1,3 @@ -import numpy as np -from scipy.spatial import distance - def _ensure_spacing(coord, spacing, p_norm, max_out): ... def ensure_spacing( coords, diff --git a/stubs/skimage/_shared/filters.pyi b/stubs/skimage/_shared/filters.pyi index 86044ed1..e327531b 100644 --- a/stubs/skimage/_shared/filters.pyi +++ b/stubs/skimage/_shared/filters.pyi @@ -1,13 +1,9 @@ -from collections.abc import Iterable from typing import Literal -import numpy as np from numpy.typing import ArrayLike, NDArray -from scipy import ndimage as ndi from .._typing import Scalar from . import utils -from .utils import _supported_float_type, convert_to_float, warn @utils.deprecate_multichannel_kwarg(multichannel_position=5) def gaussian( diff --git a/stubs/skimage/_shared/lazy.pyi b/stubs/skimage/_shared/lazy.pyi index 7fd2b0c5..cd1637eb 100644 --- a/stubs/skimage/_shared/lazy.pyi +++ b/stubs/skimage/_shared/lazy.pyi @@ -1,7 +1,3 @@ -import importlib -import importlib.util -import os -import sys from collections.abc import Mapping def attach( diff --git a/stubs/skimage/_shared/setup.pyi b/stubs/skimage/_shared/setup.pyi index ae1561c5..ee8e7fe1 100644 --- a/stubs/skimage/_shared/setup.pyi +++ b/stubs/skimage/_shared/setup.pyi @@ -1,7 +1,5 @@ #!/usr/bin/env python -import os - base_path = ... def configuration(parent_package="", top_path=None): ... diff --git a/stubs/skimage/_shared/tester.pyi b/stubs/skimage/_shared/tester.pyi index 68d3872e..503d8f2c 100644 --- a/stubs/skimage/_shared/tester.pyi +++ b/stubs/skimage/_shared/tester.pyi @@ -1,5 +1,3 @@ -import os -import sys from typing import Literal from numpy.typing import ArrayLike diff --git a/stubs/skimage/_shared/testing.pyi b/stubs/skimage/_shared/testing.pyi index 5fd0c21b..dfa611b1 100644 --- a/stubs/skimage/_shared/testing.pyi +++ b/stubs/skimage/_shared/testing.pyi @@ -1,31 +1,5 @@ -import functools -import os -import re -import struct -import threading -import warnings -from tempfile import NamedTemporaryFile - -import numpy as np -from numpy import testing -from numpy.testing import ( - TestCase, - assert_, - assert_allclose, - assert_almost_equal, - assert_array_almost_equal, - assert_array_almost_equal_nulp, - assert_array_equal, - assert_array_less, - assert_equal, - assert_no_warnings, - assert_warns, -) from numpy.typing import ArrayLike -from ..data._fetchers import _fetch -from ._warnings import expected_warnings - SKIP_RE = ... skipif = ... diff --git a/stubs/skimage/_shared/utils.pyi b/stubs/skimage/_shared/utils.pyi index 6982371a..9711e09f 100644 --- a/stubs/skimage/_shared/utils.pyi +++ b/stubs/skimage/_shared/utils.pyi @@ -1,13 +1,6 @@ -import functools -import inspect -import sys -import warnings from collections.abc import Iterable, Mapping from typing import Any, Literal -import numpy as np -import scipy -from numpy.lib import NumpyVersion from numpy.typing import ArrayLike, NDArray from ._warnings import all_warnings, warn diff --git a/stubs/skimage/_shared/version_requirements.pyi b/stubs/skimage/_shared/version_requirements.pyi index db580c1d..79c5af39 100644 --- a/stubs/skimage/_shared/version_requirements.pyi +++ b/stubs/skimage/_shared/version_requirements.pyi @@ -1,7 +1,3 @@ -import sys - -from packaging import version as _version - def ensure_python_version(min_version): ... def _check_version(actver, version, cmp_op): ... def get_module_version(module_name): ... diff --git a/stubs/sklearn/__check_build/setup.pyi b/stubs/sklearn/__check_build/setup.pyi index 44de5687..89a51327 100644 --- a/stubs/sklearn/__check_build/setup.pyi +++ b/stubs/sklearn/__check_build/setup.pyi @@ -1,7 +1,3 @@ -import numpy -from numpy.distutils.core import setup -from numpy.distutils.misc_util import Configuration - # Author: Virgile Fritsch # License: BSD 3 clause diff --git a/stubs/sklearn/_build_utils/openmp_helpers.pyi b/stubs/sklearn/_build_utils/openmp_helpers.pyi index 8d0903c4..e164f531 100644 --- a/stubs/sklearn/_build_utils/openmp_helpers.pyi +++ b/stubs/sklearn/_build_utils/openmp_helpers.pyi @@ -1,10 +1,3 @@ -import os -import sys -import textwrap -import warnings - -from .pre_build_helpers import compile_test_program as compile_test_program - # 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 diff --git a/stubs/sklearn/_build_utils/pre_build_helpers.pyi b/stubs/sklearn/_build_utils/pre_build_helpers.pyi index ec856823..fef5f184 100644 --- a/stubs/sklearn/_build_utils/pre_build_helpers.pyi +++ b/stubs/sklearn/_build_utils/pre_build_helpers.pyi @@ -1,9 +1,2 @@ -import glob -import os -import subprocess -import sys -import tempfile -import textwrap - def compile_test_program(code, extra_preargs: list = [], extra_postargs: list = []): ... def basic_check_build(): ... diff --git a/stubs/sklearn/_config.pyi b/stubs/sklearn/_config.pyi index f75ca4de..f8e5c8d1 100644 --- a/stubs/sklearn/_config.pyi +++ b/stubs/sklearn/_config.pyi @@ -1,5 +1,4 @@ from collections.abc import Iterator -from contextlib import contextmanager as contextmanager from typing import Literal from ._typing import Int diff --git a/stubs/sklearn/_loss/glm_distribution.pyi b/stubs/sklearn/_loss/glm_distribution.pyi index f8c29acc..39192191 100644 --- a/stubs/sklearn/_loss/glm_distribution.pyi +++ b/stubs/sklearn/_loss/glm_distribution.pyi @@ -1,10 +1,6 @@ -import numbers from abc import ABCMeta, abstractmethod -from collections import namedtuple as namedtuple -import numpy as np from numpy import ndarray -from scipy.special import xlogy as xlogy from .._typing import ArrayLike, Float diff --git a/stubs/sklearn/_loss/link.pyi b/stubs/sklearn/_loss/link.pyi index 07bd5700..a8d64aa4 100644 --- a/stubs/sklearn/_loss/link.pyi +++ b/stubs/sklearn/_loss/link.pyi @@ -2,13 +2,9 @@ from abc import ABC, abstractmethod from dataclasses import dataclass from typing import ClassVar -import numpy as np from numpy import ndarray -from scipy.special import expit as expit, logit as logit -from scipy.stats import gmean as gmean from .._typing import ArrayLike, Float -from ..utils.extmath import softmax as softmax @dataclass class Interval: diff --git a/stubs/sklearn/_loss/loss.pyi b/stubs/sklearn/_loss/loss.pyi index 498d1d26..1fd43012 100644 --- a/stubs/sklearn/_loss/loss.pyi +++ b/stubs/sklearn/_loss/loss.pyi @@ -1,32 +1,14 @@ -import numbers from typing import ClassVar, Literal -import numpy as np from numpy import ndarray -from scipy.special import xlogy as xlogy from .._typing import ArrayLike, Float, Int, MatrixLike, Scalar -from ..utils import check_scalar as check_scalar -from ..utils._readonly_array_wrapper import ReadonlyArrayWrapper as ReadonlyArrayWrapper from ._loss import ( - CyAbsoluteError as CyAbsoluteError, - CyHalfBinomialLoss as CyHalfBinomialLoss, - CyHalfGammaLoss as CyHalfGammaLoss, - CyHalfMultinomialLoss as CyHalfMultinomialLoss, - CyHalfPoissonLoss as CyHalfPoissonLoss, - CyHalfSquaredError, - CyHalfTweedieLoss as CyHalfTweedieLoss, - CyHalfTweedieLossIdentity as CyHalfTweedieLossIdentity, CyLossFunction, - CyPinballLoss as CyPinballLoss, ) from .link import ( BaseLink, - IdentityLink, Interval, - LogitLink as LogitLink, - LogLink as LogLink, - MultinomialLogit as MultinomialLogit, ) # Goals: diff --git a/stubs/sklearn/_loss/setup.pyi b/stubs/sklearn/_loss/setup.pyi index 5e4f0fc9..892f4b82 100644 --- a/stubs/sklearn/_loss/setup.pyi +++ b/stubs/sklearn/_loss/setup.pyi @@ -1,7 +1 @@ -import numpy -from numpy.distutils.core import setup -from numpy.distutils.misc_util import Configuration - -from .._build_utils import gen_from_templates - def configuration(parent_package: str = "", top_path=None): ... diff --git a/stubs/sklearn/_min_dependencies.pyi b/stubs/sklearn/_min_dependencies.pyi index 00ad0122..f261f376 100644 --- a/stubs/sklearn/_min_dependencies.pyi +++ b/stubs/sklearn/_min_dependencies.pyi @@ -1,5 +1,3 @@ -from collections import defaultdict as defaultdict - SCIPY_MIN_VERSION: str = ... JOBLIB_MIN_VERSION: str = ... THREADPOOLCTL_MIN_VERSION: str = ... diff --git a/stubs/sklearn/cluster/_affinity_propagation.pyi b/stubs/sklearn/cluster/_affinity_propagation.pyi index 22a76c00..e9607428 100644 --- a/stubs/sklearn/cluster/_affinity_propagation.pyi +++ b/stubs/sklearn/cluster/_affinity_propagation.pyi @@ -1,18 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from .._config import config_context as config_context from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClusterMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics import euclidean_distances as euclidean_distances, pairwise_distances_argmin as pairwise_distances_argmin -from ..utils import as_float_array as as_float_array, check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted ############################################################################### # Public API diff --git a/stubs/sklearn/cluster/_agglomerative.pyi b/stubs/sklearn/cluster/_agglomerative.pyi index 9a28bc65..c74bb260 100644 --- a/stubs/sklearn/cluster/_agglomerative.pyi +++ b/stubs/sklearn/cluster/_agglomerative.pyi @@ -1,23 +1,11 @@ -from heapq import heapify as heapify, heappop as heappop, heappush as heappush, heappushpop as heappushpop -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from joblib import Memory from numpy import ndarray -from scipy import sparse as sparse -from scipy.cluster import hierarchy as hierarchy -from scipy.sparse.csgraph import connected_components as connected_components from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, ClusterMixin -from ..metrics import DistanceMetric as DistanceMetric -from ..metrics._dist_metrics import METRIC_MAPPING as METRIC_MAPPING -from ..metrics.pairwise import paired_distances as paired_distances -from ..utils import check_array as check_array -from ..utils._fast_dict import IntFloatDict as IntFloatDict -from ..utils._param_validation import HasMethods as HasMethods, Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_memory as check_memory from ._feature_agglomeration import AgglomerationTransform ############################################################################### diff --git a/stubs/sklearn/cluster/_bicluster.pyi b/stubs/sklearn/cluster/_bicluster.pyi index 850a5e34..c64e5625 100644 --- a/stubs/sklearn/cluster/_bicluster.pyi +++ b/stubs/sklearn/cluster/_bicluster.pyi @@ -1,25 +1,12 @@ from abc import ABCMeta, abstractmethod -from numbers import Integral as Integral from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.linalg import norm as norm -from scipy.sparse import dia_matrix as dia_matrix, issparse as issparse -from scipy.sparse.linalg import eigsh as eigsh, svds as svds from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, BiclusterMixin -from ..utils import check_random_state as check_random_state, check_scalar as check_scalar -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import ( - make_nonnegative as make_nonnegative, - randomized_svd as randomized_svd, - safe_sparse_dot as safe_sparse_dot, -) -from ..utils.validation import assert_all_finite as assert_all_finite -from . import KMeans as KMeans, MiniBatchKMeans as MiniBatchKMeans __all__ = ["SpectralCoclustering", "SpectralBiclustering"] diff --git a/stubs/sklearn/cluster/_birch.pyi b/stubs/sklearn/cluster/_birch.pyi index 054320bb..51371d75 100644 --- a/stubs/sklearn/cluster/_birch.pyi +++ b/stubs/sklearn/cluster/_birch.pyi @@ -1,22 +1,11 @@ -from math import sqrt as sqrt -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar from typing_extensions import Self from numpy import ndarray -from scipy import sparse as sparse from scipy.sparse import spmatrix -from .._config import config_context as config_context from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, ClusterMixin, TransformerMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics import pairwise_distances_argmin as pairwise_distances_argmin -from ..metrics.pairwise import euclidean_distances as euclidean_distances -from ..utils._param_validation import Interval as Interval -from ..utils.extmath import row_norms as row_norms -from ..utils.validation import check_is_fitted as check_is_fitted -from . import AgglomerativeClustering as AgglomerativeClustering # Authors: Manoj Kumar # Alexandre Gramfort diff --git a/stubs/sklearn/cluster/_bisect_k_means.pyi b/stubs/sklearn/cluster/_bisect_k_means.pyi index ee383bb5..ba21a3f4 100644 --- a/stubs/sklearn/cluster/_bisect_k_means.pyi +++ b/stubs/sklearn/cluster/_bisect_k_means.pyi @@ -6,9 +6,6 @@ from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..utils._param_validation import StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms -from ..utils.validation import check_is_fitted as check_is_fitted, check_random_state as check_random_state from ._kmeans import _BaseKMeans # Author: Michal Krawczyk diff --git a/stubs/sklearn/cluster/_dbscan.pyi b/stubs/sklearn/cluster/_dbscan.pyi index bc84bcb7..4d1d4e48 100644 --- a/stubs/sklearn/cluster/_dbscan.pyi +++ b/stubs/sklearn/cluster/_dbscan.pyi @@ -1,15 +1,10 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy import sparse as sparse from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClusterMixin -from ..neighbors import NearestNeighbors as NearestNeighbors -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ._dbscan_inner import dbscan_inner as dbscan_inner # Author: Robert Layton # Joel Nothman diff --git a/stubs/sklearn/cluster/_feature_agglomeration.pyi b/stubs/sklearn/cluster/_feature_agglomeration.pyi index 2ac4d826..45e68faa 100644 --- a/stubs/sklearn/cluster/_feature_agglomeration.pyi +++ b/stubs/sklearn/cluster/_feature_agglomeration.pyi @@ -1,9 +1,7 @@ from numpy import ndarray -from scipy.sparse import issparse as issparse from .._typing import ArrayLike, MatrixLike from ..base import TransformerMixin -from ..utils.validation import check_is_fitted as check_is_fitted # Author: V. Michel, A. Gramfort # License: BSD 3 clause diff --git a/stubs/sklearn/cluster/_kmeans.pyi b/stubs/sklearn/cluster/_kmeans.pyi index 6a073d6e..29858c2d 100644 --- a/stubs/sklearn/cluster/_kmeans.pyi +++ b/stubs/sklearn/cluster/_kmeans.pyi @@ -1,5 +1,4 @@ -from abc import ABC, abstractmethod as abstractmethod -from numbers import Integral as Integral, Real as Real +from abc import ABC from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self @@ -8,31 +7,6 @@ from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, ClusterMixin, TransformerMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics.pairwise import euclidean_distances as euclidean_distances -from ..utils import check_array as check_array, check_random_state as check_random_state -from ..utils._param_validation import ( - Hidden as Hidden, - Interval as Interval, - StrOptions as StrOptions, - validate_params as validate_params, -) -from ..utils._readonly_array_wrapper import ReadonlyArrayWrapper as ReadonlyArrayWrapper -from ..utils.extmath import row_norms as row_norms, stable_cumsum as stable_cumsum -from ..utils.sparsefuncs import mean_variance_axis as mean_variance_axis -from ..utils.sparsefuncs_fast import assign_rows_csr as assign_rows_csr -from ..utils.validation import check_is_fitted as check_is_fitted -from ._k_means_common import CHUNK_SIZE as CHUNK_SIZE -from ._k_means_elkan import ( - elkan_iter_chunked_dense as elkan_iter_chunked_dense, - elkan_iter_chunked_sparse as elkan_iter_chunked_sparse, - init_bounds_dense as init_bounds_dense, - init_bounds_sparse as init_bounds_sparse, -) -from ._k_means_lloyd import ( - lloyd_iter_chunked_dense as lloyd_iter_chunked_dense, - lloyd_iter_chunked_sparse as lloyd_iter_chunked_sparse, -) ############################################################################### # Initialization heuristic diff --git a/stubs/sklearn/cluster/_mean_shift.pyi b/stubs/sklearn/cluster/_mean_shift.pyi index 7b28cdd0..8dbd0224 100644 --- a/stubs/sklearn/cluster/_mean_shift.pyi +++ b/stubs/sklearn/cluster/_mean_shift.pyi @@ -1,20 +1,11 @@ -from collections import defaultdict as defaultdict -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from .._config import config_context as config_context from .._typing import Float, Int, MatrixLike from ..base import BaseEstimator, ClusterMixin -from ..metrics.pairwise import pairwise_distances_argmin as pairwise_distances_argmin -from ..neighbors import NearestNeighbors as NearestNeighbors -from ..utils import check_array as check_array, check_random_state as check_random_state, gen_batches as gen_batches -from ..utils._param_validation import Interval as Interval -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted # Authors: Conrad Lee # Alexandre Gramfort diff --git a/stubs/sklearn/cluster/_optics.pyi b/stubs/sklearn/cluster/_optics.pyi index ff92bf7d..2ec25de4 100644 --- a/stubs/sklearn/cluster/_optics.pyi +++ b/stubs/sklearn/cluster/_optics.pyi @@ -1,20 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from joblib import Memory from numpy import ndarray -from scipy.sparse import SparseEfficiencyWarning as SparseEfficiencyWarning, issparse as issparse from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClusterMixin -from ..exceptions import DataConversionWarning as DataConversionWarning -from ..metrics import pairwise_distances as pairwise_distances -from ..metrics.pairwise import PAIRWISE_BOOLEAN_FUNCTIONS as PAIRWISE_BOOLEAN_FUNCTIONS -from ..neighbors import NearestNeighbors as NearestNeighbors -from ..utils import gen_batches as gen_batches, get_chunk_n_rows as get_chunk_n_rows -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_memory as check_memory class OPTICS(ClusterMixin, BaseEstimator): feature_names_in_: ndarray = ... diff --git a/stubs/sklearn/cluster/_spectral.pyi b/stubs/sklearn/cluster/_spectral.pyi index f3c98f9c..69718432 100644 --- a/stubs/sklearn/cluster/_spectral.pyi +++ b/stubs/sklearn/cluster/_spectral.pyi @@ -1,22 +1,13 @@ from collections.abc import Mapping -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.linalg import LinAlgError as LinAlgError, qr as qr, svd as svd -from scipy.sparse import csc_matrix as csc_matrix from scipy.sparse._coo import coo_matrix from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClusterMixin -from ..manifold import spectral_embedding as spectral_embedding -from ..metrics.pairwise import KERNEL_PARAMS as KERNEL_PARAMS, pairwise_kernels as pairwise_kernels -from ..neighbors import NearestNeighbors as NearestNeighbors, kneighbors_graph as kneighbors_graph -from ..utils import as_float_array as as_float_array, check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ._kmeans import k_means as k_means def cluster_qr(vectors: MatrixLike) -> ndarray: ... def discretize( diff --git a/stubs/sklearn/compose/_column_transformer.pyi b/stubs/sklearn/compose/_column_transformer.pyi index a28d56aa..e8ac8613 100644 --- a/stubs/sklearn/compose/_column_transformer.pyi +++ b/stubs/sklearn/compose/_column_transformer.pyi @@ -1,21 +1,14 @@ -from collections import Counter as Counter from collections.abc import Sequence -from itertools import chain as chain from typing import ClassVar, Literal from typing_extensions import Self from numpy import dtype, ndarray -from scipy import sparse as sparse from scipy.sparse import spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, TransformerMixin, clone as clone -from ..preprocessing import FunctionTransformer as FunctionTransformer -from ..utils import check_pandas_support as check_pandas_support +from ..base import BaseEstimator, TransformerMixin from ..utils._bunch import Bunch from ..utils.metaestimators import _BaseComposition -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_array as check_array, check_is_fitted as check_is_fitted __all__ = ["ColumnTransformer", "make_column_transformer", "make_column_selector"] diff --git a/stubs/sklearn/compose/_target.pyi b/stubs/sklearn/compose/_target.pyi index ae396a14..5d476d41 100644 --- a/stubs/sklearn/compose/_target.pyi +++ b/stubs/sklearn/compose/_target.pyi @@ -4,13 +4,7 @@ from typing_extensions import Self from numpy import ndarray from .._typing import ArrayLike, MatrixLike -from ..base import BaseEstimator, RegressorMixin, clone as clone -from ..exceptions import NotFittedError as NotFittedError -from ..linear_model import LinearRegression as LinearRegression -from ..preprocessing import FunctionTransformer as FunctionTransformer -from ..utils import check_array as check_array -from ..utils._param_validation import HasMethods as HasMethods -from ..utils.validation import check_is_fitted as check_is_fitted +from ..base import BaseEstimator, RegressorMixin # Authors: Andreas Mueller # Guillaume Lemaitre diff --git a/stubs/sklearn/covariance/_elliptic_envelope.pyi b/stubs/sklearn/covariance/_elliptic_envelope.pyi index 14924bc4..9f44da5d 100644 --- a/stubs/sklearn/covariance/_elliptic_envelope.pyi +++ b/stubs/sklearn/covariance/_elliptic_envelope.pyi @@ -1,4 +1,3 @@ -from numbers import Real as Real from typing import Any, ClassVar from typing_extensions import Self @@ -7,9 +6,6 @@ from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import OutlierMixin -from ..metrics import accuracy_score as accuracy_score -from ..utils._param_validation import Interval as Interval -from ..utils.validation import check_is_fitted as check_is_fitted from . import MinCovDet # Author: Virgile Fritsch diff --git a/stubs/sklearn/covariance/_empirical_covariance.pyi b/stubs/sklearn/covariance/_empirical_covariance.pyi index 454ecf1b..8189f10b 100644 --- a/stubs/sklearn/covariance/_empirical_covariance.pyi +++ b/stubs/sklearn/covariance/_empirical_covariance.pyi @@ -2,14 +2,9 @@ from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy import linalg as linalg -from .. import config_context as config_context from .._typing import ArrayLike, Float, MatrixLike from ..base import BaseEstimator -from ..metrics.pairwise import pairwise_distances as pairwise_distances -from ..utils import check_array as check_array -from ..utils.extmath import fast_logdet as fast_logdet # Author: Alexandre Gramfort # Gael Varoquaux diff --git a/stubs/sklearn/covariance/_graph_lasso.pyi b/stubs/sklearn/covariance/_graph_lasso.pyi index de9c236f..e732c1c5 100644 --- a/stubs/sklearn/covariance/_graph_lasso.pyi +++ b/stubs/sklearn/covariance/_graph_lasso.pyi @@ -1,19 +1,12 @@ from collections.abc import Iterable -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy import linalg as linalg from .._typing import ArrayLike, Float, Int, MatrixLike -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..linear_model import lars_path_gram as lars_path_gram -from ..model_selection import BaseCrossValidator, check_cv as check_cv, cross_val_score as cross_val_score -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_random_state as check_random_state, check_scalar as check_scalar -from . import EmpiricalCovariance, empirical_covariance as empirical_covariance, log_likelihood as log_likelihood +from ..model_selection import BaseCrossValidator +from . import EmpiricalCovariance # Author: Gael Varoquaux # License: BSD 3 clause diff --git a/stubs/sklearn/covariance/_robust_covariance.pyi b/stubs/sklearn/covariance/_robust_covariance.pyi index b3d9f66c..98974510 100644 --- a/stubs/sklearn/covariance/_robust_covariance.pyi +++ b/stubs/sklearn/covariance/_robust_covariance.pyi @@ -1,17 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg -from scipy.stats import chi2 as chi2 from .._typing import Float, Int, MatrixLike -from ..utils import check_array as check_array, check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval -from ..utils.extmath import fast_logdet as fast_logdet -from . import EmpiricalCovariance, empirical_covariance as empirical_covariance +from . import EmpiricalCovariance # Author: Virgile Fritsch # diff --git a/stubs/sklearn/covariance/_shrunk_covariance.pyi b/stubs/sklearn/covariance/_shrunk_covariance.pyi index a83229d6..24792bb7 100644 --- a/stubs/sklearn/covariance/_shrunk_covariance.pyi +++ b/stubs/sklearn/covariance/_shrunk_covariance.pyi @@ -1,14 +1,10 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar from typing_extensions import Self from numpy import ndarray -from .._config import config_context as config_context from .._typing import Float, Int, MatrixLike -from ..utils import check_array as check_array -from ..utils._param_validation import Interval as Interval -from . import EmpiricalCovariance, empirical_covariance as empirical_covariance +from . import EmpiricalCovariance # Author: Alexandre Gramfort # Gael Varoquaux diff --git a/stubs/sklearn/cross_decomposition/_pls.pyi b/stubs/sklearn/cross_decomposition/_pls.pyi index e74d0534..edddf93b 100644 --- a/stubs/sklearn/cross_decomposition/_pls.pyi +++ b/stubs/sklearn/cross_decomposition/_pls.pyi @@ -1,5 +1,4 @@ from abc import ABCMeta, abstractmethod -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self @@ -7,11 +6,6 @@ from numpy import ndarray from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, MultiOutputMixin, RegressorMixin, TransformerMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_array as check_array, check_consistent_length as check_consistent_length -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import svd_flip as svd_flip -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted __all__ = ["PLSCanonical", "PLSRegression", "PLSSVD"] diff --git a/stubs/sklearn/datasets/_arff_parser.pyi b/stubs/sklearn/datasets/_arff_parser.pyi index a25359f2..0d928a32 100644 --- a/stubs/sklearn/datasets/_arff_parser.pyi +++ b/stubs/sklearn/datasets/_arff_parser.pyi @@ -1,5 +1,4 @@ -from collections import OrderedDict as OrderedDict -from collections.abc import Generator as Generator, Sequence +from collections.abc import Sequence from gzip import GzipFile from typing import Any, Literal @@ -7,9 +6,6 @@ from numpy import ndarray from pandas import DataFrame, Series from scipy.sparse import spmatrix -from ..externals._arff import ArffSparseDataType as ArffSparseDataType -from ..utils import check_pandas_support as check_pandas_support, get_chunk_n_rows as get_chunk_n_rows - def load_arff_from_gzip_file( gzip_file: GzipFile, parser: Literal["pandas", "liac-arff"], diff --git a/stubs/sklearn/datasets/_base.pyi b/stubs/sklearn/datasets/_base.pyi index f5dfb66c..25478dba 100644 --- a/stubs/sklearn/datasets/_base.pyi +++ b/stubs/sklearn/datasets/_base.pyi @@ -2,22 +2,13 @@ # 2010 Fabian Pedregosa # 2010 Olivier Grisel # License: BSD 3 clause -from collections import namedtuple as namedtuple from collections.abc import Sequence -from importlib import resources as resources -from os import environ as environ, listdir as listdir, makedirs as makedirs -from os.path import expanduser as expanduser, isdir as isdir, join as join, splitext as splitext -from pathlib import Path as Path from typing import Literal -from urllib.request import urlretrieve as urlretrieve from numpy import ndarray from numpy.random import RandomState -from PIL import Image as Image from .._typing import Int -from ..preprocessing import scale as scale -from ..utils import check_pandas_support as check_pandas_support, check_random_state as check_random_state from ..utils._bunch import Bunch DATA_MODULE: str = ... diff --git a/stubs/sklearn/datasets/_california_housing.pyi b/stubs/sklearn/datasets/_california_housing.pyi index 61cf4f6f..f00168fc 100644 --- a/stubs/sklearn/datasets/_california_housing.pyi +++ b/stubs/sklearn/datasets/_california_housing.pyi @@ -1,9 +1,4 @@ -from os import makedirs as makedirs, remove as remove -from os.path import exists as exists - from ..utils import Bunch -from . import get_data_home as get_data_home -from ._base import RemoteFileMetadata as RemoteFileMetadata, load_descr as load_descr # The original data can be found at: # https://www.dcc.fc.up.pt/~ltorgo/Regression/cal_housing.tgz diff --git a/stubs/sklearn/datasets/_covtype.pyi b/stubs/sklearn/datasets/_covtype.pyi index 0b52f365..ae07a0fb 100644 --- a/stubs/sklearn/datasets/_covtype.pyi +++ b/stubs/sklearn/datasets/_covtype.pyi @@ -1,15 +1,8 @@ -from gzip import GzipFile as GzipFile -from os.path import exists as exists, join as join -from tempfile import TemporaryDirectory as TemporaryDirectory - from numpy import ndarray from numpy.random import RandomState from .._typing import Int -from ..utils import check_random_state as check_random_state from ..utils._bunch import Bunch -from . import get_data_home as get_data_home -from ._base import RemoteFileMetadata as RemoteFileMetadata, load_descr as load_descr # The original data can be found in: # https://archive.ics.uci.edu/ml/machine-learning-databases/covtype/covtype.data.gz diff --git a/stubs/sklearn/datasets/_kddcup99.pyi b/stubs/sklearn/datasets/_kddcup99.pyi index c5a60193..7585e33b 100644 --- a/stubs/sklearn/datasets/_kddcup99.pyi +++ b/stubs/sklearn/datasets/_kddcup99.pyi @@ -1,14 +1,9 @@ -from gzip import GzipFile as GzipFile -from os.path import exists as exists, join as join from typing import Literal from numpy.random import RandomState from .._typing import Int -from ..utils import check_random_state as check_random_state from ..utils._bunch import Bunch -from . import get_data_home as get_data_home -from ._base import RemoteFileMetadata as RemoteFileMetadata, load_descr as load_descr # The original data can be found at: # https://archive.ics.uci.edu/ml/machine-learning-databases/kddcup99-mld/kddcup.data.gz diff --git a/stubs/sklearn/datasets/_lfw.pyi b/stubs/sklearn/datasets/_lfw.pyi index 31635420..863a20d3 100644 --- a/stubs/sklearn/datasets/_lfw.pyi +++ b/stubs/sklearn/datasets/_lfw.pyi @@ -1,12 +1,7 @@ -from os import listdir as listdir, makedirs as makedirs, remove as remove -from os.path import exists as exists, isdir as isdir, join as join from typing import Literal -from joblib import Memory as Memory - from .._typing import Float, Int from ..utils._bunch import Bunch -from ._base import RemoteFileMetadata as RemoteFileMetadata, get_data_home as get_data_home, load_descr as load_descr logger = ... diff --git a/stubs/sklearn/datasets/_olivetti_faces.pyi b/stubs/sklearn/datasets/_olivetti_faces.pyi index 453252aa..d20d833a 100644 --- a/stubs/sklearn/datasets/_olivetti_faces.pyi +++ b/stubs/sklearn/datasets/_olivetti_faces.pyi @@ -1,15 +1,8 @@ -from os import makedirs as makedirs, remove as remove -from os.path import exists as exists - from numpy import ndarray from numpy.random import RandomState -from scipy.io import loadmat as loadmat from .._typing import Int -from ..utils import check_random_state as check_random_state from ..utils._bunch import Bunch -from . import get_data_home as get_data_home -from ._base import RemoteFileMetadata as RemoteFileMetadata, load_descr as load_descr # The original data can be found at: # https://cs.nyu.edu/~roweis/data/olivettifaces.mat diff --git a/stubs/sklearn/datasets/_openml.pyi b/stubs/sklearn/datasets/_openml.pyi index fa7362ad..b5d047e7 100644 --- a/stubs/sklearn/datasets/_openml.pyi +++ b/stubs/sklearn/datasets/_openml.pyi @@ -1,14 +1,6 @@ -from contextlib import closing as closing -from functools import wraps as wraps -from os.path import join as join -from tempfile import TemporaryDirectory as TemporaryDirectory from typing import Literal, overload -from urllib.error import HTTPError as HTTPError, URLError as URLError -from urllib.request import Request as Request, urlopen as urlopen -from ..utils import Bunch, check_pandas_support as check_pandas_support -from . import get_data_home as get_data_home -from ._arff_parser import load_arff_from_gzip_file as load_arff_from_gzip_file +from ..utils import Bunch __all__ = ["fetch_openml"] diff --git a/stubs/sklearn/datasets/_rcv1.pyi b/stubs/sklearn/datasets/_rcv1.pyi index 806e5958..204f23ba 100644 --- a/stubs/sklearn/datasets/_rcv1.pyi +++ b/stubs/sklearn/datasets/_rcv1.pyi @@ -1,15 +1,9 @@ -from gzip import GzipFile as GzipFile -from os import makedirs as makedirs, remove as remove -from os.path import exists as exists, join as join from typing import Literal from numpy.random import RandomState from .._typing import Int from ..utils import Bunch -from . import get_data_home as get_data_home -from ._base import RemoteFileMetadata as RemoteFileMetadata, load_descr as load_descr -from ._svmlight_format_io import load_svmlight_files as load_svmlight_files # Author: Tom Dupre la Tour # License: BSD 3 clause diff --git a/stubs/sklearn/datasets/_samples_generator.pyi b/stubs/sklearn/datasets/_samples_generator.pyi index b70711a6..35b4df9a 100644 --- a/stubs/sklearn/datasets/_samples_generator.pyi +++ b/stubs/sklearn/datasets/_samples_generator.pyi @@ -3,13 +3,9 @@ from typing import Literal from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg from scipy.sparse import spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike -from ..preprocessing import MultiLabelBinarizer as MultiLabelBinarizer -from ..utils import check_array as check_array, check_random_state as check_random_state -from ..utils.random import sample_without_replacement as sample_without_replacement # Authors: B. Thirion, G. Varoquaux, A. Gramfort, V. Michel, O. Grisel, # G. Louppe, J. Nothman diff --git a/stubs/sklearn/datasets/_species_distributions.pyi b/stubs/sklearn/datasets/_species_distributions.pyi index 7a2acaef..65356c93 100644 --- a/stubs/sklearn/datasets/_species_distributions.pyi +++ b/stubs/sklearn/datasets/_species_distributions.pyi @@ -1,12 +1,6 @@ -from io import BytesIO as BytesIO -from os import makedirs as makedirs, remove as remove -from os.path import exists as exists - from numpy import ndarray from ..utils._bunch import Bunch -from . import get_data_home as get_data_home -from ._base import RemoteFileMetadata as RemoteFileMetadata # The original data can be found at: # https://biodiversityinformatics.amnh.org/open_source/maxent/samples.zip diff --git a/stubs/sklearn/datasets/_svmlight_format_io.pyi b/stubs/sklearn/datasets/_svmlight_format_io.pyi index 78eabb36..9046715c 100644 --- a/stubs/sklearn/datasets/_svmlight_format_io.pyi +++ b/stubs/sklearn/datasets/_svmlight_format_io.pyi @@ -1,11 +1,9 @@ -from contextlib import closing as closing from typing import IO, Literal from numpy import dtype, ndarray from scipy.sparse import spmatrix from .._typing import ArrayLike, Int, MatrixLike, PathLike -from ..utils import IS_PYPY as IS_PYPY, check_array as check_array def load_svmlight_file( f: PathLike | str | IO | int, diff --git a/stubs/sklearn/datasets/_twenty_newsgroups.pyi b/stubs/sklearn/datasets/_twenty_newsgroups.pyi index 01c00588..c0688927 100644 --- a/stubs/sklearn/datasets/_twenty_newsgroups.pyi +++ b/stubs/sklearn/datasets/_twenty_newsgroups.pyi @@ -3,13 +3,8 @@ from typing import Literal from numpy import ndarray from numpy.random import RandomState -from .. import preprocessing as preprocessing from .._typing import ArrayLike, Int -from ..feature_extraction.text import CountVectorizer as CountVectorizer -from ..utils import check_random_state as check_random_state from ..utils._bunch import Bunch -from . import get_data_home as get_data_home, load_files as load_files -from ._base import RemoteFileMetadata as RemoteFileMetadata, load_descr as load_descr # Copyright (c) 2011 Olivier Grisel # License: BSD 3 clause diff --git a/stubs/sklearn/decomposition/_base.pyi b/stubs/sklearn/decomposition/_base.pyi index 781aa1d2..fa3091ee 100644 --- a/stubs/sklearn/decomposition/_base.pyi +++ b/stubs/sklearn/decomposition/_base.pyi @@ -2,11 +2,9 @@ from abc import ABCMeta, abstractmethod from typing_extensions import Self from numpy import ndarray -from scipy import linalg as linalg from .._typing import MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Alexandre Gramfort # Olivier Grisel diff --git a/stubs/sklearn/decomposition/_dict_learning.pyi b/stubs/sklearn/decomposition/_dict_learning.pyi index 522c1304..2ef8698c 100644 --- a/stubs/sklearn/decomposition/_dict_learning.pyi +++ b/stubs/sklearn/decomposition/_dict_learning.pyi @@ -1,27 +1,14 @@ -from math import ceil as ceil -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..linear_model import Lars as Lars, Lasso as Lasso, LassoLars as LassoLars, orthogonal_mp_gram as orthogonal_mp_gram from ..utils import ( - check_array as check_array, - check_random_state as check_random_state, deprecated, - gen_batches as gen_batches, - gen_even_slices as gen_even_slices, ) -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import randomized_svd as randomized_svd, row_norms as row_norms, svd_flip as svd_flip -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Vlad Niculae, Gael Varoquaux, Alexandre Gramfort # License: BSD 3 clause diff --git a/stubs/sklearn/decomposition/_factor_analysis.pyi b/stubs/sklearn/decomposition/_factor_analysis.pyi index ef30eb52..aab07487 100644 --- a/stubs/sklearn/decomposition/_factor_analysis.pyi +++ b/stubs/sklearn/decomposition/_factor_analysis.pyi @@ -1,19 +1,11 @@ -from math import log as log, sqrt as sqrt -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import fast_logdet as fast_logdet, randomized_svd as randomized_svd, squared_norm as squared_norm -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Christian Osendorfer # Alexandre Gramfort diff --git a/stubs/sklearn/decomposition/_fastica.pyi b/stubs/sklearn/decomposition/_fastica.pyi index a1a65745..f1f33061 100644 --- a/stubs/sklearn/decomposition/_fastica.pyi +++ b/stubs/sklearn/decomposition/_fastica.pyi @@ -1,17 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg from .._typing import Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import as_float_array as as_float_array, check_array as check_array, check_random_state as check_random_state -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted # Authors: Pierre Lafaye de Micheaux, Stefan van der Walt, Gael Varoquaux, # Bertrand Thirion, Alexandre Gramfort, Denis A. Engemann diff --git a/stubs/sklearn/decomposition/_incremental_pca.pyi b/stubs/sklearn/decomposition/_incremental_pca.pyi index 0d8d22c0..2066664b 100644 --- a/stubs/sklearn/decomposition/_incremental_pca.pyi +++ b/stubs/sklearn/decomposition/_incremental_pca.pyi @@ -1,14 +1,9 @@ -from numbers import Integral as Integral from typing import Any, ClassVar from typing_extensions import Self from numpy import ndarray -from scipy import linalg as linalg, sparse as sparse from .._typing import ArrayLike, Int, MatrixLike -from ..utils import gen_batches as gen_batches -from ..utils._param_validation import Interval as Interval -from ..utils.extmath import svd_flip as svd_flip from ._base import _BasePCA class IncrementalPCA(_BasePCA): diff --git a/stubs/sklearn/decomposition/_kernel_pca.pyi b/stubs/sklearn/decomposition/_kernel_pca.pyi index b12725fc..f4666711 100644 --- a/stubs/sklearn/decomposition/_kernel_pca.pyi +++ b/stubs/sklearn/decomposition/_kernel_pca.pyi @@ -1,20 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg -from scipy.sparse.linalg import eigsh as eigsh from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..exceptions import NotFittedError as NotFittedError -from ..metrics.pairwise import pairwise_kernels as pairwise_kernels -from ..preprocessing import KernelCenterer as KernelCenterer -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import svd_flip as svd_flip -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Mathieu Blondel # Sylvain Marie diff --git a/stubs/sklearn/decomposition/_lda.pyi b/stubs/sklearn/decomposition/_lda.pyi index 823c11c7..3ce9c373 100644 --- a/stubs/sklearn/decomposition/_lda.pyi +++ b/stubs/sklearn/decomposition/_lda.pyi @@ -1,18 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from numpy.random import RandomState -from scipy.special import gammaln as gammaln, logsumexp as logsumexp from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..utils import check_random_state as check_random_state, gen_batches as gen_batches, gen_even_slices as gen_even_slices -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted, check_non_negative as check_non_negative EPS = ... diff --git a/stubs/sklearn/decomposition/_nmf.pyi b/stubs/sklearn/decomposition/_nmf.pyi index 9d5cb68c..0ddbcfb0 100644 --- a/stubs/sklearn/decomposition/_nmf.pyi +++ b/stubs/sklearn/decomposition/_nmf.pyi @@ -1,22 +1,13 @@ from abc import ABC -from math import sqrt as sqrt -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg from scipy.sparse import spmatrix -from .._config import config_context as config_context from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_array as check_array, check_random_state as check_random_state, gen_batches as gen_batches -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions, validate_params as validate_params -from ..utils.extmath import randomized_svd as randomized_svd, safe_sparse_dot as safe_sparse_dot, squared_norm as squared_norm -from ..utils.validation import check_is_fitted as check_is_fitted, check_non_negative as check_non_negative EPSILON = ... diff --git a/stubs/sklearn/decomposition/_pca.pyi b/stubs/sklearn/decomposition/_pca.pyi index 5874b533..98d182b5 100644 --- a/stubs/sklearn/decomposition/_pca.pyi +++ b/stubs/sklearn/decomposition/_pca.pyi @@ -1,26 +1,11 @@ -from math import log as log, sqrt as sqrt -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg -from scipy.sparse import issparse as issparse -from scipy.sparse.linalg import svds as svds -from scipy.special import gammaln as gammaln from .._typing import Float, Int, MatrixLike -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions from ..utils.deprecation import deprecated -from ..utils.extmath import ( - fast_logdet as fast_logdet, - randomized_svd as randomized_svd, - stable_cumsum as stable_cumsum, - svd_flip as svd_flip, -) -from ..utils.validation import check_is_fitted as check_is_fitted from ._base import _BasePCA class PCA(_BasePCA): diff --git a/stubs/sklearn/decomposition/_sparse_pca.pyi b/stubs/sklearn/decomposition/_sparse_pca.pyi index 7a0e4420..2123540e 100644 --- a/stubs/sklearn/decomposition/_sparse_pca.pyi +++ b/stubs/sklearn/decomposition/_sparse_pca.pyi @@ -1,4 +1,3 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self @@ -7,12 +6,6 @@ from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..linear_model import ridge_regression as ridge_regression -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import svd_flip as svd_flip -from ..utils.validation import check_array as check_array, check_is_fitted as check_is_fitted -from ._dict_learning import MiniBatchDictionaryLearning as MiniBatchDictionaryLearning, dict_learning as dict_learning class _BaseSparsePCA(ClassNamePrefixFeaturesOutMixin, TransformerMixin, BaseEstimator): _parameter_constraints: ClassVar[dict] = ... diff --git a/stubs/sklearn/decomposition/_truncated_svd.pyi b/stubs/sklearn/decomposition/_truncated_svd.pyi index f2f4eb1a..042df5d2 100644 --- a/stubs/sklearn/decomposition/_truncated_svd.pyi +++ b/stubs/sklearn/decomposition/_truncated_svd.pyi @@ -1,18 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.sparse.linalg import svds as svds from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..utils import check_array as check_array, check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import randomized_svd as randomized_svd, safe_sparse_dot as safe_sparse_dot, svd_flip as svd_flip -from ..utils.sparsefuncs import mean_variance_axis as mean_variance_axis -from ..utils.validation import check_is_fitted as check_is_fitted __all__ = ["TruncatedSVD"] diff --git a/stubs/sklearn/ensemble/_bagging.pyi b/stubs/sklearn/ensemble/_bagging.pyi index 830bb033..942d3a0b 100644 --- a/stubs/sklearn/ensemble/_bagging.pyi +++ b/stubs/sklearn/ensemble/_bagging.pyi @@ -1,24 +1,12 @@ from abc import ABCMeta, abstractmethod -from functools import partial as partial -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar from typing_extensions import Self -from warnings import warn as warn from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, ClassifierMixin, RegressorMixin -from ..metrics import accuracy_score as accuracy_score, r2_score as r2_score -from ..tree import DecisionTreeClassifier as DecisionTreeClassifier, DecisionTreeRegressor as DecisionTreeRegressor -from ..utils import check_random_state as check_random_state, column_or_1d as column_or_1d, indices_to_mask as indices_to_mask -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, StrOptions as StrOptions -from ..utils.metaestimators import available_if as available_if -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.random import sample_without_replacement as sample_without_replacement -from ..utils.validation import check_is_fitted as check_is_fitted, has_fit_parameter as has_fit_parameter from ._base import BaseEnsemble # Author: Gilles Louppe diff --git a/stubs/sklearn/ensemble/_base.pyi b/stubs/sklearn/ensemble/_base.pyi index f8dcbd75..0e8db704 100644 --- a/stubs/sklearn/ensemble/_base.pyi +++ b/stubs/sklearn/ensemble/_base.pyi @@ -3,16 +3,9 @@ from collections.abc import Sequence from typing import Any, ClassVar from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs - from .._typing import Int -from ..base import BaseEstimator, MetaEstimatorMixin, clone as clone, is_classifier as is_classifier, is_regressor as is_regressor -from ..tree import ( - BaseDecisionTree as BaseDecisionTree, - DecisionTreeClassifier as DecisionTreeClassifier, - DecisionTreeRegressor as DecisionTreeRegressor, -) -from ..utils import Bunch, check_random_state as check_random_state, deprecated +from ..base import BaseEstimator, MetaEstimatorMixin +from ..utils import Bunch, deprecated from ..utils.metaestimators import _BaseComposition class BaseEnsemble(MetaEstimatorMixin, BaseEstimator, metaclass=ABCMeta): diff --git a/stubs/sklearn/ensemble/_forest.pyi b/stubs/sklearn/ensemble/_forest.pyi index c7506184..726d1c0f 100644 --- a/stubs/sklearn/ensemble/_forest.pyi +++ b/stubs/sklearn/ensemble/_forest.pyi @@ -1,31 +1,20 @@ from abc import ABCMeta, abstractmethod from collections.abc import Mapping, Sequence -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self -from warnings import catch_warnings as catch_warnings, simplefilter as simplefilter, warn as warn from numpy import ndarray from numpy.random import RandomState -from scipy.sparse import issparse as issparse, spmatrix +from scipy.sparse import spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import ClassifierMixin, MultiOutputMixin, RegressorMixin, TransformerMixin, is_classifier as is_classifier -from ..exceptions import DataConversionWarning as DataConversionWarning -from ..metrics import accuracy_score as accuracy_score, r2_score as r2_score +from ..base import ClassifierMixin, MultiOutputMixin, RegressorMixin, TransformerMixin from ..preprocessing import OneHotEncoder from ..tree import ( - BaseDecisionTree as BaseDecisionTree, DecisionTreeClassifier, DecisionTreeRegressor, - ExtraTreeClassifier as ExtraTreeClassifier, ExtraTreeRegressor, ) -from ..utils import check_random_state as check_random_state, compute_sample_weight as compute_sample_weight -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.multiclass import check_classification_targets as check_classification_targets, type_of_target as type_of_target -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted from ._base import BaseEnsemble __all__ = [ diff --git a/stubs/sklearn/ensemble/_gb.pyi b/stubs/sklearn/ensemble/_gb.pyi index 014c955b..5fea3b87 100644 --- a/stubs/sklearn/ensemble/_gb.pyi +++ b/stubs/sklearn/ensemble/_gb.pyi @@ -1,26 +1,16 @@ from abc import ABCMeta, abstractmethod from collections.abc import Iterator -from numbers import Integral as Integral, Real as Real -from time import time as time from typing import Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.sparse import csc_matrix as csc_matrix, csr_matrix as csr_matrix, issparse as issparse from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, ClassifierMixin, RegressorMixin, is_classifier as is_classifier -from ..exceptions import NotFittedError as NotFittedError -from ..model_selection import train_test_split as train_test_split -from ..tree import DecisionTreeRegressor as DecisionTreeRegressor -from ..utils import check_array as check_array, check_random_state as check_random_state, column_or_1d as column_or_1d, deprecated -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, StrOptions as StrOptions -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.validation import check_is_fitted as check_is_fitted +from ..base import BaseEstimator, ClassifierMixin, RegressorMixin +from ..utils import deprecated from ._base import BaseEnsemble from ._gb_losses import LossFunction -from ._gradient_boosting import predict_stage as predict_stage, predict_stages as predict_stages class VerboseReporter: def __init__(self, verbose: Int) -> None: ... diff --git a/stubs/sklearn/ensemble/_gb_losses.pyi b/stubs/sklearn/ensemble/_gb_losses.pyi index 55a3d555..637a3a29 100644 --- a/stubs/sklearn/ensemble/_gb_losses.pyi +++ b/stubs/sklearn/ensemble/_gb_losses.pyi @@ -2,11 +2,10 @@ from abc import ABCMeta, abstractmethod from typing import Any, ClassVar from numpy import ndarray -from scipy.special import expit as expit, logsumexp as logsumexp from .._typing import ArrayLike, Float, Int, MatrixLike from ..dummy import DummyClassifier, DummyRegressor -from ..tree._tree import TREE_LEAF as TREE_LEAF, Tree +from ..tree._tree import Tree class LossFunction(metaclass=ABCMeta): K: int = ... diff --git a/stubs/sklearn/ensemble/_hist_gradient_boosting/_bitset.pyi b/stubs/sklearn/ensemble/_hist_gradient_boosting/_bitset.pyi index 3f3c9ca4..aad2159d 100644 --- a/stubs/sklearn/ensemble/_hist_gradient_boosting/_bitset.pyi +++ b/stubs/sklearn/ensemble/_hist_gradient_boosting/_bitset.pyi @@ -1,6 +1,4 @@ import numpy as np -from .common import X_BINNED_DTYPE_C - -def set_bitset_memoryview(bitset: np.ndarray, val: X_BINNED_DTYPE_C) -> None: ... +def set_bitset_memoryview(bitset: np.ndarray, val: np.uint8) -> None: ... def set_raw_bitset_from_binned_bitset(raw_bitset: np.ndarray, binned_bitset: np.ndarray, categories: np.ndarray) -> None: ... diff --git a/stubs/sklearn/ensemble/_hist_gradient_boosting/binning.pyi b/stubs/sklearn/ensemble/_hist_gradient_boosting/binning.pyi index 7bd77b07..bf77c062 100644 --- a/stubs/sklearn/ensemble/_hist_gradient_boosting/binning.pyi +++ b/stubs/sklearn/ensemble/_hist_gradient_boosting/binning.pyi @@ -1,22 +1,11 @@ from collections.abc import Sequence from typing_extensions import Self -import numpy as np from numpy import ndarray, uint8 from numpy.random import RandomState from ..._typing import ArrayLike, Int, MatrixLike from ...base import BaseEstimator, TransformerMixin -from ...utils import check_array as check_array, check_random_state as check_random_state -from ...utils.fixes import percentile as percentile -from ...utils.validation import check_is_fitted as check_is_fitted -from ._bitset import set_bitset_memoryview as set_bitset_memoryview -from .common import ( - ALMOST_INF as ALMOST_INF, - X_BINNED_DTYPE as X_BINNED_DTYPE, - X_BITSET_INNER_DTYPE as X_BITSET_INNER_DTYPE, - X_DTYPE as X_DTYPE, -) # Author: Nicolas Hug diff --git a/stubs/sklearn/ensemble/_hist_gradient_boosting/common.pyi b/stubs/sklearn/ensemble/_hist_gradient_boosting/common.pyi index f3997c74..60f86fcb 100644 --- a/stubs/sklearn/ensemble/_hist_gradient_boosting/common.pyi +++ b/stubs/sklearn/ensemble/_hist_gradient_boosting/common.pyi @@ -1,10 +1,7 @@ import numpy as np from numpy import ( - float32 as G_H_DTYPE, - float32 as X_BITSET_INNER_DTYPE, float64 as X_DTYPE, float64 as Y_DTYPE, - uint8 as X_BINNED_DTYPE_C, uint32 as X_BINNED_DTYPE, ) diff --git a/stubs/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.pyi b/stubs/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.pyi index 98b9b9f0..29e4736d 100644 --- a/stubs/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.pyi +++ b/stubs/sklearn/ensemble/_hist_gradient_boosting/gradient_boosting.pyi @@ -1,39 +1,13 @@ -import itertools -import warnings from abc import ABC, abstractmethod from collections.abc import Mapping, Sequence -from functools import partial as partial -from numbers import Integral as Integral, Real as Real -from timeit import default_timer as time from typing import Callable, ClassVar, Literal from typing_extensions import Self -import numpy as np from numpy import ndarray from numpy.random import RandomState -from ..._loss.loss import ( - BaseLoss as BaseLoss, - HalfBinomialLoss as HalfBinomialLoss, - HalfMultinomialLoss as HalfMultinomialLoss, - HalfPoissonLoss as HalfPoissonLoss, - PinballLoss as PinballLoss, -) from ..._typing import ArrayLike, Float, Int, MatrixLike -from ...base import BaseEstimator, ClassifierMixin, RegressorMixin, is_classifier as is_classifier -from ...metrics import check_scoring as check_scoring -from ...model_selection import train_test_split as train_test_split -from ...preprocessing import LabelEncoder as LabelEncoder -from ...utils import ( - check_random_state as check_random_state, - compute_sample_weight as compute_sample_weight, - resample as resample, -) -from ...utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ...utils.multiclass import check_classification_targets as check_classification_targets -from ...utils.validation import check_consistent_length as check_consistent_length, check_is_fitted as check_is_fitted -from .common import G_H_DTYPE as G_H_DTYPE, X_DTYPE as X_DTYPE, Y_DTYPE as Y_DTYPE -from .grower import TreeGrower as TreeGrower +from ...base import BaseEstimator, ClassifierMixin, RegressorMixin class BaseHistGradientBoosting(BaseEstimator, ABC): _parameter_constraints: ClassVar[dict] = ... diff --git a/stubs/sklearn/ensemble/_hist_gradient_boosting/grower.pyi b/stubs/sklearn/ensemble/_hist_gradient_boosting/grower.pyi index 4e008527..77333765 100644 --- a/stubs/sklearn/ensemble/_hist_gradient_boosting/grower.pyi +++ b/stubs/sklearn/ensemble/_hist_gradient_boosting/grower.pyi @@ -1,23 +1,11 @@ -import numbers -from heapq import heappop as heappop, heappush as heappush -from timeit import default_timer as time from typing import ClassVar -import numpy as np from numpy import ndarray from ..._typing import ArrayLike, Float, Int, MatrixLike -from ._bitset import set_raw_bitset_from_binned_bitset as set_raw_bitset_from_binned_bitset -from .common import ( - PREDICTOR_RECORD_DTYPE as PREDICTOR_RECORD_DTYPE, - X_BITSET_INNER_DTYPE as X_BITSET_INNER_DTYPE, - Y_DTYPE as Y_DTYPE, - MonotonicConstraint as MonotonicConstraint, -) from .histogram import HistogramBuilder from .predictor import TreePredictor from .splitting import SplitInfo, Splitter -from .utils import sum_parallel as sum_parallel EPS = ... # to avoid zero division errors diff --git a/stubs/sklearn/ensemble/_hist_gradient_boosting/predictor.pyi b/stubs/sklearn/ensemble/_hist_gradient_boosting/predictor.pyi index 13494417..ae591f01 100644 --- a/stubs/sklearn/ensemble/_hist_gradient_boosting/predictor.pyi +++ b/stubs/sklearn/ensemble/_hist_gradient_boosting/predictor.pyi @@ -1,8 +1,6 @@ -import numpy as np from numpy import ndarray from ..._typing import ArrayLike, Int, MatrixLike -from .common import Y_DTYPE as Y_DTYPE # Author: Nicolas Hug diff --git a/stubs/sklearn/ensemble/_iforest.pyi b/stubs/sklearn/ensemble/_iforest.pyi index 5f9d3855..771a4f10 100644 --- a/stubs/sklearn/ensemble/_iforest.pyi +++ b/stubs/sklearn/ensemble/_iforest.pyi @@ -1,23 +1,12 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self -from warnings import warn as warn from numpy import ndarray from numpy.random import RandomState -from scipy.sparse import issparse as issparse from .._typing import ArrayLike, Int, MatrixLike from ..base import OutlierMixin from ..tree import ExtraTreeRegressor -from ..utils import ( - check_array as check_array, - check_random_state as check_random_state, - gen_batches as gen_batches, - get_chunk_n_rows as get_chunk_n_rows, -) -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted from ._bagging import BaseBagging # Authors: Nicolas Goix diff --git a/stubs/sklearn/ensemble/_stacking.pyi b/stubs/sklearn/ensemble/_stacking.pyi index c740d713..02de213f 100644 --- a/stubs/sklearn/ensemble/_stacking.pyi +++ b/stubs/sklearn/ensemble/_stacking.pyi @@ -1,7 +1,5 @@ from abc import ABCMeta, abstractmethod from collections.abc import Iterable, Sequence -from copy import deepcopy as deepcopy -from numbers import Integral as Integral from typing import ClassVar, Literal from typing_extensions import Self @@ -13,22 +11,12 @@ from ..base import ( ClassifierMixin, RegressorMixin, TransformerMixin, - clone as clone, - is_classifier as is_classifier, - is_regressor as is_regressor, ) -from ..exceptions import NotFittedError as NotFittedError from ..linear_model._logistic import LogisticRegression from ..linear_model._ridge import RidgeCV -from ..model_selection import BaseCrossValidator, check_cv as check_cv, cross_val_predict as cross_val_predict +from ..model_selection import BaseCrossValidator from ..pipeline import Pipeline -from ..preprocessing import LabelEncoder as LabelEncoder from ..utils import Bunch -from ..utils._param_validation import HasMethods as HasMethods, StrOptions as StrOptions -from ..utils.metaestimators import available_if as available_if -from ..utils.multiclass import check_classification_targets as check_classification_targets, type_of_target as type_of_target -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted, column_or_1d as column_or_1d from ._base import _BaseHeterogeneousEnsemble class _BaseStacking(TransformerMixin, _BaseHeterogeneousEnsemble, metaclass=ABCMeta): diff --git a/stubs/sklearn/ensemble/_voting.pyi b/stubs/sklearn/ensemble/_voting.pyi index 7b267982..2dcaa3e6 100644 --- a/stubs/sklearn/ensemble/_voting.pyi +++ b/stubs/sklearn/ensemble/_voting.pyi @@ -1,20 +1,13 @@ from abc import abstractmethod -from numbers import Integral as Integral from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray from .._typing import ArrayLike, Int, MatrixLike -from ..base import BaseEstimator, ClassifierMixin, RegressorMixin, TransformerMixin, clone as clone -from ..exceptions import NotFittedError as NotFittedError +from ..base import BaseEstimator, ClassifierMixin, RegressorMixin, TransformerMixin from ..preprocessing import LabelEncoder from ..utils import Bunch -from ..utils._param_validation import StrOptions as StrOptions -from ..utils.metaestimators import available_if as available_if -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted, column_or_1d as column_or_1d from ._base import _BaseHeterogeneousEnsemble class _BaseVoting(TransformerMixin, _BaseHeterogeneousEnsemble): diff --git a/stubs/sklearn/ensemble/_weight_boosting.pyi b/stubs/sklearn/ensemble/_weight_boosting.pyi index 15ea2d13..23a515e6 100644 --- a/stubs/sklearn/ensemble/_weight_boosting.pyi +++ b/stubs/sklearn/ensemble/_weight_boosting.pyi @@ -1,21 +1,13 @@ from abc import ABCMeta, abstractmethod from collections.abc import Iterator -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.special import xlogy as xlogy from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, ClassifierMixin, RegressorMixin, is_classifier as is_classifier, is_regressor as is_regressor -from ..metrics import accuracy_score as accuracy_score, r2_score as r2_score -from ..tree import DecisionTreeClassifier as DecisionTreeClassifier, DecisionTreeRegressor as DecisionTreeRegressor -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import softmax as softmax, stable_cumsum as stable_cumsum -from ..utils.validation import check_is_fitted as check_is_fitted, has_fit_parameter as has_fit_parameter +from ..base import BaseEstimator, ClassifierMixin, RegressorMixin from ._base import BaseEnsemble __all__ = [ diff --git a/stubs/sklearn/externals/_arff.pyi b/stubs/sklearn/externals/_arff.pyi index e6f225e9..9cece692 100644 --- a/stubs/sklearn/externals/_arff.pyi +++ b/stubs/sklearn/externals/_arff.pyi @@ -1,5 +1,4 @@ from typing import ClassVar, Literal -from typing_extensions import TypedDict as TypedDict # ============================================================================= # Federal University of Rio Grande do Sul (UFRGS) diff --git a/stubs/sklearn/externals/_lobpcg.pyi b/stubs/sklearn/externals/_lobpcg.pyi index aa6e49d3..a5f1b5b7 100644 --- a/stubs/sklearn/externals/_lobpcg.pyi +++ b/stubs/sklearn/externals/_lobpcg.pyi @@ -1,15 +1,6 @@ from typing import Callable from numpy import ndarray -from scipy.linalg import ( - LinAlgError as LinAlgError, - cho_factor as cho_factor, - cho_solve as cho_solve, - cholesky as cholesky, - eigh as eigh, - inv as inv, -) -from scipy.sparse import isspmatrix as isspmatrix from scipy.sparse.linalg import LinearOperator from .._typing import ArrayLike, Float, Int, MatrixLike, Scalar diff --git a/stubs/sklearn/externals/_packaging/version.pyi b/stubs/sklearn/externals/_packaging/version.pyi index 6153de39..5997a02b 100644 --- a/stubs/sklearn/externals/_packaging/version.pyi +++ b/stubs/sklearn/externals/_packaging/version.pyi @@ -2,10 +2,8 @@ import typing_extensions from typing import Callable, ClassVar from ._structures import ( - Infinity as Infinity, - InfinityType as InfinityType, - NegativeInfinity as NegativeInfinity, - NegativeInfinityType as NegativeInfinityType, + InfinityType, + NegativeInfinityType, ) # Copyright (c) Donald Stufft and individual contributors. diff --git a/stubs/sklearn/feature_extraction/_dict_vectorizer.pyi b/stubs/sklearn/feature_extraction/_dict_vectorizer.pyi index 29b1bc28..80769a49 100644 --- a/stubs/sklearn/feature_extraction/_dict_vectorizer.pyi +++ b/stubs/sklearn/feature_extraction/_dict_vectorizer.pyi @@ -1,7 +1,4 @@ -from array import array as array from collections.abc import Iterable, Iterator, Mapping -from numbers import Number as Number -from operator import itemgetter as itemgetter from typing import Any, ClassVar from typing_extensions import Self @@ -10,7 +7,6 @@ from scipy.sparse import spmatrix from .._typing import ArrayLike, MatrixLike from ..base import BaseEstimator, TransformerMixin -from ..utils import check_array as check_array # Authors: Lars Buitinck # Dan Blanchard diff --git a/stubs/sklearn/feature_extraction/_hash.pyi b/stubs/sklearn/feature_extraction/_hash.pyi index 0a011998..8c34082e 100644 --- a/stubs/sklearn/feature_extraction/_hash.pyi +++ b/stubs/sklearn/feature_extraction/_hash.pyi @@ -1,6 +1,4 @@ from collections.abc import Iterator -from itertools import chain as chain -from numbers import Integral as Integral from typing import Any, ClassVar from typing_extensions import Self @@ -9,7 +7,6 @@ from scipy.sparse import spmatrix from .._typing import Int from ..base import BaseEstimator, TransformerMixin -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions # Author: Lars Buitinck # License: BSD 3 clause diff --git a/stubs/sklearn/feature_selection/_base.pyi b/stubs/sklearn/feature_selection/_base.pyi index aba7f8f9..27f03341 100644 --- a/stubs/sklearn/feature_selection/_base.pyi +++ b/stubs/sklearn/feature_selection/_base.pyi @@ -1,13 +1,10 @@ -from abc import ABCMeta, abstractmethod as abstractmethod -from operator import attrgetter as attrgetter +from abc import ABCMeta from numpy import ndarray -from scipy.sparse import csc_matrix as csc_matrix, issparse as issparse from scipy.sparse._csr import csr_matrix from .._typing import ArrayLike, MatrixLike from ..base import TransformerMixin -from ..utils import check_array as check_array, safe_mask as safe_mask, safe_sqr as safe_sqr # Authors: G. Varoquaux, A. Gramfort, L. Buitinck, J. Nothman # License: BSD 3 clause diff --git a/stubs/sklearn/feature_selection/_from_model.pyi b/stubs/sklearn/feature_selection/_from_model.pyi index 8d3b252f..78c36ba7 100644 --- a/stubs/sklearn/feature_selection/_from_model.pyi +++ b/stubs/sklearn/feature_selection/_from_model.pyi @@ -1,16 +1,10 @@ -from copy import deepcopy as deepcopy -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar from typing_extensions import Self from numpy import ndarray from .._typing import ArrayLike, MatrixLike -from ..base import BaseEstimator, MetaEstimatorMixin, clone as clone -from ..exceptions import NotFittedError as NotFittedError -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, Options as Options -from ..utils.metaestimators import available_if as available_if -from ..utils.validation import check_is_fitted as check_is_fitted, check_scalar as check_scalar +from ..base import BaseEstimator, MetaEstimatorMixin from ._base import SelectorMixin # Authors: Gilles Louppe, Mathieu Blondel, Maheshakya Wijewardena diff --git a/stubs/sklearn/feature_selection/_mutual_info.pyi b/stubs/sklearn/feature_selection/_mutual_info.pyi index 323d1f34..276e7050 100644 --- a/stubs/sklearn/feature_selection/_mutual_info.pyi +++ b/stubs/sklearn/feature_selection/_mutual_info.pyi @@ -2,16 +2,8 @@ from typing import Literal from numpy import ndarray from numpy.random import RandomState -from scipy.sparse import issparse as issparse -from scipy.special import digamma as digamma from .._typing import ArrayLike, Int, MatrixLike -from ..metrics.cluster import mutual_info_score as mutual_info_score -from ..neighbors import KDTree as KDTree, NearestNeighbors as NearestNeighbors -from ..preprocessing import scale as scale -from ..utils import check_random_state as check_random_state -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.validation import check_array as check_array, check_X_y as check_X_y # Author: Nikolay Mayorov # License: 3-clause BSD diff --git a/stubs/sklearn/feature_selection/_rfe.pyi b/stubs/sklearn/feature_selection/_rfe.pyi index 84cbf598..630a0f26 100644 --- a/stubs/sklearn/feature_selection/_rfe.pyi +++ b/stubs/sklearn/feature_selection/_rfe.pyi @@ -1,20 +1,13 @@ from collections.abc import Iterable -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from .._typing import ArrayLike, Int, MatrixLike -from ..base import BaseEstimator, MetaEstimatorMixin, clone as clone, is_classifier as is_classifier +from ..base import BaseEstimator, MetaEstimatorMixin from ..linear_model._logistic import LogisticRegression -from ..metrics import check_scoring as check_scoring -from ..model_selection import BaseCrossValidator, check_cv as check_cv -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval -from ..utils.metaestimators import available_if as available_if -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted +from ..model_selection import BaseCrossValidator from ._base import SelectorMixin # Authors: Alexandre Gramfort diff --git a/stubs/sklearn/feature_selection/_sequential.pyi b/stubs/sklearn/feature_selection/_sequential.pyi index 9df3b3ca..777a020b 100644 --- a/stubs/sklearn/feature_selection/_sequential.pyi +++ b/stubs/sklearn/feature_selection/_sequential.pyi @@ -1,16 +1,12 @@ from collections.abc import Iterable -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, MetaEstimatorMixin, clone as clone -from ..metrics import get_scorer_names as get_scorer_names -from ..model_selection import BaseCrossValidator, cross_val_score as cross_val_score -from ..utils._param_validation import HasMethods as HasMethods, Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted +from ..base import BaseEstimator, MetaEstimatorMixin +from ..model_selection import BaseCrossValidator from ._base import SelectorMixin class SequentialFeatureSelector(SelectorMixin, MetaEstimatorMixin, BaseEstimator): diff --git a/stubs/sklearn/feature_selection/_univariate_selection.pyi b/stubs/sklearn/feature_selection/_univariate_selection.pyi index 5e042787..fec2ff79 100644 --- a/stubs/sklearn/feature_selection/_univariate_selection.pyi +++ b/stubs/sklearn/feature_selection/_univariate_selection.pyi @@ -1,25 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar, Literal from typing_extensions import Self from joblib.memory import MemorizedFunc from numpy import ndarray -from scipy import special as special -from scipy.sparse import issparse as issparse from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator -from ..preprocessing import LabelBinarizer as LabelBinarizer -from ..utils import ( - as_float_array as as_float_array, - check_array as check_array, - check_X_y as check_X_y, - safe_mask as safe_mask, - safe_sqr as safe_sqr, -) -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms, safe_sparse_dot as safe_sparse_dot -from ..utils.validation import check_is_fitted as check_is_fitted from ._base import SelectorMixin # Authors: V. Michel, B. Thirion, G. Varoquaux, A. Gramfort, E. Duchesnay. diff --git a/stubs/sklearn/feature_selection/_variance_threshold.pyi b/stubs/sklearn/feature_selection/_variance_threshold.pyi index d8b92e6e..4caa70ec 100644 --- a/stubs/sklearn/feature_selection/_variance_threshold.pyi +++ b/stubs/sklearn/feature_selection/_variance_threshold.pyi @@ -1,4 +1,3 @@ -from numbers import Real as Real from typing import Any, ClassVar from typing_extensions import Self @@ -6,9 +5,6 @@ from numpy import ndarray from .._typing import Float, MatrixLike from ..base import BaseEstimator -from ..utils._param_validation import Interval as Interval -from ..utils.sparsefuncs import mean_variance_axis as mean_variance_axis, min_max_axis as min_max_axis -from ..utils.validation import check_is_fitted as check_is_fitted from ._base import SelectorMixin # Author: Lars Buitinck diff --git a/stubs/sklearn/gaussian_process/_gpc.pyi b/stubs/sklearn/gaussian_process/_gpc.pyi index ed3ae566..71699c1b 100644 --- a/stubs/sklearn/gaussian_process/_gpc.pyi +++ b/stubs/sklearn/gaussian_process/_gpc.pyi @@ -1,21 +1,12 @@ -from numbers import Integral as Integral -from operator import itemgetter as itemgetter from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.linalg import cho_solve as cho_solve, cholesky as cholesky, solve as solve -from scipy.special import expit as expit from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, ClassifierMixin, clone as clone -from ..multiclass import OneVsOneClassifier as OneVsOneClassifier, OneVsRestClassifier as OneVsRestClassifier -from ..preprocessing import LabelEncoder as LabelEncoder -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted -from .kernels import RBF as RBF, CompoundKernel as CompoundKernel, Kernel, Product +from ..base import BaseEstimator, ClassifierMixin +from .kernels import Kernel, Product # Values required for approximating the logistic sigmoid by # error functions. coefs are obtained via: diff --git a/stubs/sklearn/gaussian_process/_gpr.pyi b/stubs/sklearn/gaussian_process/_gpr.pyi index 79eafa2e..7639e12a 100644 --- a/stubs/sklearn/gaussian_process/_gpr.pyi +++ b/stubs/sklearn/gaussian_process/_gpr.pyi @@ -1,17 +1,12 @@ -from numbers import Integral as Integral, Real as Real -from operator import itemgetter as itemgetter from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.linalg import cho_solve as cho_solve, cholesky as cholesky, solve_triangular as solve_triangular from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, MultiOutputMixin, RegressorMixin, clone as clone -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from .kernels import RBF as RBF, Kernel +from ..base import BaseEstimator, MultiOutputMixin, RegressorMixin +from .kernels import Kernel # Authors: Jan Hendrik Metzen # Modified by: Pete Green diff --git a/stubs/sklearn/impute/_base.pyi b/stubs/sklearn/impute/_base.pyi index 72c0ae1f..a99c5ad0 100644 --- a/stubs/sklearn/impute/_base.pyi +++ b/stubs/sklearn/impute/_base.pyi @@ -1,4 +1,3 @@ -from collections import Counter as Counter from typing import Any, ClassVar, Literal from typing_extensions import Self @@ -7,9 +6,6 @@ from scipy.sparse import spmatrix from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, TransformerMixin -from ..utils import is_scalar_nan as is_scalar_nan -from ..utils._param_validation import Hidden as Hidden, StrOptions as StrOptions -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted # Authors: Nicolas Tresegnie # Sergey Feldman diff --git a/stubs/sklearn/impute/_iterative.pyi b/stubs/sklearn/impute/_iterative.pyi index 5de2bc2d..df305e70 100644 --- a/stubs/sklearn/impute/_iterative.pyi +++ b/stubs/sklearn/impute/_iterative.pyi @@ -1,21 +1,11 @@ -from collections import namedtuple as namedtuple -from numbers import Integral as Integral, Real as Real -from time import time as time from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import stats as stats from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, clone as clone -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..linear_model import BayesianRidge as BayesianRidge -from ..preprocessing import normalize as normalize -from ..utils import check_array as check_array, check_random_state as check_random_state, is_scalar_nan as is_scalar_nan -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted +from ..base import BaseEstimator from ._base import MissingIndicator, SimpleImputer, _BaseImputer _ImputerTriplet = ... diff --git a/stubs/sklearn/impute/_knn.pyi b/stubs/sklearn/impute/_knn.pyi index c98b6f68..5f99674a 100644 --- a/stubs/sklearn/impute/_knn.pyi +++ b/stubs/sklearn/impute/_knn.pyi @@ -1,14 +1,9 @@ -from numbers import Integral as Integral from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from .._typing import ArrayLike, Int, MatrixLike -from ..metrics import pairwise_distances_chunked as pairwise_distances_chunked -from ..utils import is_scalar_nan as is_scalar_nan -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted from ._base import MissingIndicator, _BaseImputer # Authors: Ashim Bhattarai diff --git a/stubs/sklearn/inspection/_partial_dependence.pyi b/stubs/sklearn/inspection/_partial_dependence.pyi index 1d457fa3..5061888b 100644 --- a/stubs/sklearn/inspection/_partial_dependence.pyi +++ b/stubs/sklearn/inspection/_partial_dependence.pyi @@ -1,20 +1,9 @@ -from collections.abc import Iterable as Iterable, Sequence +from collections.abc import Sequence from typing import Literal -from scipy import sparse as sparse -from scipy.stats.mstats import mquantiles as mquantiles - from .._typing import ArrayLike, Int, MatrixLike -from ..base import BaseEstimator, is_classifier as is_classifier, is_regressor as is_regressor -from ..ensemble import RandomForestRegressor as RandomForestRegressor -from ..ensemble._gb import BaseGradientBoosting as BaseGradientBoosting -from ..ensemble._hist_gradient_boosting.gradient_boosting import BaseHistGradientBoosting as BaseHistGradientBoosting -from ..exceptions import NotFittedError as NotFittedError -from ..tree import DecisionTreeRegressor as DecisionTreeRegressor -from ..utils import check_array as check_array, check_matplotlib_support as check_matplotlib_support +from ..base import BaseEstimator from ..utils._bunch import Bunch -from ..utils.extmath import cartesian as cartesian -from ..utils.validation import check_is_fitted as check_is_fitted __all__ = [ "partial_dependence", diff --git a/stubs/sklearn/inspection/_permutation_importance.pyi b/stubs/sklearn/inspection/_permutation_importance.pyi index 7bc7eaac..4268b402 100644 --- a/stubs/sklearn/inspection/_permutation_importance.pyi +++ b/stubs/sklearn/inspection/_permutation_importance.pyi @@ -4,10 +4,7 @@ from typing import Any, Callable from numpy.random import RandomState from .._typing import ArrayLike, Int, MatrixLike -from ..metrics import check_scoring as check_scoring -from ..utils import check_array as check_array, check_random_state as check_random_state from ..utils._bunch import Bunch -from ..utils.parallel import Parallel as Parallel, delayed as delayed def permutation_importance( estimator: Any, diff --git a/stubs/sklearn/inspection/_plot/decision_boundary.pyi b/stubs/sklearn/inspection/_plot/decision_boundary.pyi index 20d96832..5ad8a7ed 100644 --- a/stubs/sklearn/inspection/_plot/decision_boundary.pyi +++ b/stubs/sklearn/inspection/_plot/decision_boundary.pyi @@ -1,17 +1,11 @@ -from functools import reduce as reduce from typing import Any, Literal -import numpy as np from matplotlib.axes import Axes from matplotlib.collections import QuadMesh from matplotlib.contour import QuadContourSet from matplotlib.figure import Figure from ..._typing import Float, Int, MatrixLike -from ...base import is_regressor as is_regressor -from ...preprocessing import LabelEncoder as LabelEncoder -from ...utils import check_matplotlib_support as check_matplotlib_support -from ...utils.validation import check_is_fitted as check_is_fitted class DecisionBoundaryDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/inspection/_plot/partial_dependence.pyi b/stubs/sklearn/inspection/_plot/partial_dependence.pyi index 6d50d2eb..f9eb2d4f 100644 --- a/stubs/sklearn/inspection/_plot/partial_dependence.pyi +++ b/stubs/sklearn/inspection/_plot/partial_dependence.pyi @@ -1,29 +1,14 @@ -import numbers -import warnings from collections.abc import Mapping, Sequence -from itertools import chain as chain -from math import ceil as ceil from typing import Literal -import numpy as np from matplotlib.axes import Axes from matplotlib.figure import Figure -from matplotlib.gridspec import GridSpecFromSubplotSpec as GridSpecFromSubplotSpec from numpy import ndarray from numpy.random import RandomState -from scipy import sparse as sparse -from scipy.stats.mstats import mquantiles as mquantiles from ..._typing import ArrayLike, Int, MatrixLike -from ...base import BaseEstimator, is_regressor as is_regressor -from ...utils import ( - check_array as check_array, - check_matplotlib_support as check_matplotlib_support, - check_random_state as check_random_state, -) +from ...base import BaseEstimator from ...utils._bunch import Bunch -from ...utils.parallel import Parallel as Parallel, delayed as delayed -from .. import partial_dependence as partial_dependence class PartialDependenceDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/linear_model/_base.pyi b/stubs/sklearn/linear_model/_base.pyi index 908a57ed..8e60f960 100644 --- a/stubs/sklearn/linear_model/_base.pyi +++ b/stubs/sklearn/linear_model/_base.pyi @@ -1,23 +1,13 @@ from abc import ABCMeta, abstractmethod -from numbers import Integral as Integral from typing import ClassVar from typing_extensions import Self from numpy import ndarray from numpy.random.mtrand import RandomState -from scipy import linalg as linalg, optimize as optimize -from scipy.sparse.linalg import lsqr as lsqr -from scipy.special import expit as expit from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, ClassifierMixin, MultiOutputMixin, RegressorMixin -from ..utils import check_array as check_array, check_random_state as check_random_state -from ..utils._array_api import get_namespace as get_namespace -from ..utils._seq_dataset import ArrayDataset32 as ArrayDataset32, ArrayDataset64, CSRDataset32 as CSRDataset32, CSRDataset64 -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.sparsefuncs import inplace_column_scale as inplace_column_scale, mean_variance_axis as mean_variance_axis -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted +from ..utils._seq_dataset import ArrayDataset64, CSRDataset64 from ._stochastic_gradient import SGDClassifier # TODO: bayesian_ridge_regression and bayesian_regression_ard diff --git a/stubs/sklearn/linear_model/_bayes.pyi b/stubs/sklearn/linear_model/_bayes.pyi index efe83a15..79a2b689 100644 --- a/stubs/sklearn/linear_model/_bayes.pyi +++ b/stubs/sklearn/linear_model/_bayes.pyi @@ -1,16 +1,10 @@ -from math import log as log -from numbers import Integral as Integral, Real as Real from typing import ClassVar from typing_extensions import Self from numpy import ndarray -from scipy import linalg as linalg -from scipy.linalg import pinvh as pinvh from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import RegressorMixin -from ..utils._param_validation import Interval as Interval -from ..utils.extmath import fast_logdet as fast_logdet from ._base import LinearModel ############################################################################### diff --git a/stubs/sklearn/linear_model/_coordinate_descent.pyi b/stubs/sklearn/linear_model/_coordinate_descent.pyi index b80dd9b7..be7a0676 100644 --- a/stubs/sklearn/linear_model/_coordinate_descent.pyi +++ b/stubs/sklearn/linear_model/_coordinate_descent.pyi @@ -1,30 +1,16 @@ from abc import ABC, abstractmethod from collections.abc import Iterable, Sequence -from functools import partial as partial -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from numpy.random import RandomState -from scipy import sparse as sparse from scipy.sparse import spmatrix from scipy.sparse._coo import coo_matrix from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import MultiOutputMixin, RegressorMixin -from ..model_selection import BaseCrossValidator, check_cv as check_cv -from ..utils import check_array as check_array, check_scalar as check_scalar -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import ( - check_consistent_length as check_consistent_length, - check_is_fitted as check_is_fitted, - check_random_state as check_random_state, - column_or_1d as column_or_1d, -) +from ..model_selection import BaseCrossValidator from ._base import LinearModel # Author: Alexandre Gramfort diff --git a/stubs/sklearn/linear_model/_glm/_newton_solver.pyi b/stubs/sklearn/linear_model/_glm/_newton_solver.pyi index 07ae9790..06a4d9c2 100644 --- a/stubs/sklearn/linear_model/_glm/_newton_solver.pyi +++ b/stubs/sklearn/linear_model/_glm/_newton_solver.pyi @@ -3,9 +3,7 @@ from abc import ABC, abstractmethod from numpy import ndarray from scipy.sparse._csr import csr_matrix -from ..._loss.loss import HalfSquaredError as HalfSquaredError from ..._typing import ArrayLike, Float, Int, MatrixLike -from ...exceptions import ConvergenceWarning as ConvergenceWarning from .._linear_loss import LinearModelLoss # Author: Christian Lorentzen diff --git a/stubs/sklearn/linear_model/_glm/glm.pyi b/stubs/sklearn/linear_model/_glm/glm.pyi index 4c7a27c7..211e24ba 100644 --- a/stubs/sklearn/linear_model/_glm/glm.pyi +++ b/stubs/sklearn/linear_model/_glm/glm.pyi @@ -1,27 +1,14 @@ -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self -import numpy as np -import scipy.optimize from numpy import ndarray -from ..._loss.glm_distribution import TweedieDistribution as TweedieDistribution from ..._loss.loss import ( BaseLoss, - HalfGammaLoss as HalfGammaLoss, - HalfPoissonLoss as HalfPoissonLoss, - HalfSquaredError as HalfSquaredError, - HalfTweedieLoss as HalfTweedieLoss, - HalfTweedieLossIdentity as HalfTweedieLossIdentity, ) from ..._typing import ArrayLike, Float, Int, MatrixLike from ...base import BaseEstimator, RegressorMixin -from ...utils import check_array as check_array, deprecated -from ...utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ...utils.validation import check_is_fitted as check_is_fitted -from .._linear_loss import LinearModelLoss as LinearModelLoss -from ._newton_solver import NewtonCholeskySolver as NewtonCholeskySolver, NewtonSolver +from ...utils import deprecated class _GeneralizedLinearRegressor(RegressorMixin, BaseEstimator): _base_loss: BaseLoss = ... diff --git a/stubs/sklearn/linear_model/_huber.pyi b/stubs/sklearn/linear_model/_huber.pyi index 21d1de5b..51364190 100644 --- a/stubs/sklearn/linear_model/_huber.pyi +++ b/stubs/sklearn/linear_model/_huber.pyi @@ -1,15 +1,10 @@ -from numbers import Integral as Integral, Real as Real from typing import ClassVar from typing_extensions import Self from numpy import ndarray -from scipy import optimize as optimize from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, RegressorMixin -from ..utils import axis0_safe_slice as axis0_safe_slice -from ..utils._param_validation import Interval as Interval -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot from ._base import LinearModel # Authors: Manoj Kumar mks542@nyu.edu diff --git a/stubs/sklearn/linear_model/_least_angle.pyi b/stubs/sklearn/linear_model/_least_angle.pyi index d43436d1..a1cd4a79 100644 --- a/stubs/sklearn/linear_model/_least_angle.pyi +++ b/stubs/sklearn/linear_model/_least_angle.pyi @@ -1,22 +1,14 @@ from collections.abc import Iterable -from math import log as log -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import interpolate as interpolate, linalg as linalg -from scipy.linalg.lapack import get_lapack_funcs as get_lapack_funcs from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import MultiOutputMixin, RegressorMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..model_selection import BaseCrossValidator, check_cv as check_cv -from ..utils import arrayfuncs as arrayfuncs, as_float_array as as_float_array, check_random_state as check_random_state -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ._base import LinearModel, LinearRegression as LinearRegression +from ..model_selection import BaseCrossValidator +from ._base import LinearModel SOLVE_TRIANGULAR_ARGS: dict = ... diff --git a/stubs/sklearn/linear_model/_linear_loss.pyi b/stubs/sklearn/linear_model/_linear_loss.pyi index 99b1c600..a8c44e52 100644 --- a/stubs/sklearn/linear_model/_linear_loss.pyi +++ b/stubs/sklearn/linear_model/_linear_loss.pyi @@ -1,11 +1,9 @@ from typing import Callable from numpy import bool_, ndarray -from scipy import sparse as sparse from .._loss.loss import BaseLoss from .._typing import ArrayLike, Float, Int, MatrixLike -from ..utils.extmath import squared_norm as squared_norm class LinearModelLoss: def __init__(self, base_loss: BaseLoss, fit_intercept: bool) -> None: ... diff --git a/stubs/sklearn/linear_model/_logistic.pyi b/stubs/sklearn/linear_model/_logistic.pyi index 2a12dbbc..86e83ec6 100644 --- a/stubs/sklearn/linear_model/_logistic.pyi +++ b/stubs/sklearn/linear_model/_logistic.pyi @@ -1,33 +1,13 @@ from collections.abc import Mapping, Sequence -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar, Literal from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from numpy.random import RandomState -from scipy import optimize as optimize -from .._loss.loss import HalfBinomialLoss as HalfBinomialLoss, HalfMultinomialLoss as HalfMultinomialLoss from .._typing import ArrayLike, Float, Int, MatrixLike -from ..metrics import get_scorer as get_scorer, get_scorer_names as get_scorer_names -from ..model_selection import BaseCrossValidator, check_cv as check_cv -from ..preprocessing import LabelBinarizer as LabelBinarizer, LabelEncoder as LabelEncoder -from ..utils import ( - check_array as check_array, - check_consistent_length as check_consistent_length, - check_random_state as check_random_state, - compute_class_weight as compute_class_weight, -) -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms, softmax as softmax -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted +from ..model_selection import BaseCrossValidator from ._base import BaseEstimator, LinearClassifierMixin, SparseCoefMixin -from ._glm.glm import NewtonCholeskySolver as NewtonCholeskySolver -from ._linear_loss import LinearModelLoss as LinearModelLoss -from ._sag import sag_solver as sag_solver # Author: Gael Varoquaux # Fabian Pedregosa diff --git a/stubs/sklearn/linear_model/_omp.pyi b/stubs/sklearn/linear_model/_omp.pyi index 5c5da6d3..6b5aba21 100644 --- a/stubs/sklearn/linear_model/_omp.pyi +++ b/stubs/sklearn/linear_model/_omp.pyi @@ -1,19 +1,12 @@ from collections.abc import Iterable -from math import sqrt as sqrt -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy import linalg as linalg -from scipy.linalg.lapack import get_lapack_funcs as get_lapack_funcs from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import MultiOutputMixin, RegressorMixin -from ..model_selection import BaseCrossValidator, check_cv as check_cv -from ..utils import as_float_array as as_float_array, check_array as check_array -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.parallel import Parallel as Parallel, delayed as delayed +from ..model_selection import BaseCrossValidator from ._base import LinearModel # Author: Vlad Niculae diff --git a/stubs/sklearn/linear_model/_passive_aggressive.pyi b/stubs/sklearn/linear_model/_passive_aggressive.pyi index 8663d939..e2f1e109 100644 --- a/stubs/sklearn/linear_model/_passive_aggressive.pyi +++ b/stubs/sklearn/linear_model/_passive_aggressive.pyi @@ -1,5 +1,4 @@ from collections.abc import Mapping -from numbers import Real as Real from typing import Callable, ClassVar from typing_extensions import Self @@ -7,8 +6,7 @@ from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ._stochastic_gradient import DEFAULT_EPSILON as DEFAULT_EPSILON, BaseSGDClassifier, BaseSGDRegressor +from ._stochastic_gradient import BaseSGDClassifier, BaseSGDRegressor # Authors: Rob Zinkov, Mathieu Blondel # License: BSD 3 clause diff --git a/stubs/sklearn/linear_model/_perceptron.pyi b/stubs/sklearn/linear_model/_perceptron.pyi index ad9c2fee..47bd56ff 100644 --- a/stubs/sklearn/linear_model/_perceptron.pyi +++ b/stubs/sklearn/linear_model/_perceptron.pyi @@ -1,12 +1,10 @@ from collections.abc import Mapping -from numbers import Real as Real from typing import ClassVar, Literal from numpy import ndarray from numpy.random import RandomState from .._typing import Float, Int -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions from ._sgd_fast import LossFunction from ._stochastic_gradient import BaseSGDClassifier diff --git a/stubs/sklearn/linear_model/_quantile.pyi b/stubs/sklearn/linear_model/_quantile.pyi index 4c9721d6..4f3855e5 100644 --- a/stubs/sklearn/linear_model/_quantile.pyi +++ b/stubs/sklearn/linear_model/_quantile.pyi @@ -1,15 +1,10 @@ -from numbers import Real as Real from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy import sparse as sparse -from scipy.optimize import linprog as linprog from .._typing import ArrayLike, Float, MatrixLike from ..base import BaseEstimator, RegressorMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions from ._base import LinearModel # Authors: David Dale diff --git a/stubs/sklearn/linear_model/_ransac.pyi b/stubs/sklearn/linear_model/_ransac.pyi index 12c723f2..d4d0cb33 100644 --- a/stubs/sklearn/linear_model/_ransac.pyi +++ b/stubs/sklearn/linear_model/_ransac.pyi @@ -1,4 +1,3 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar from typing_extensions import Self @@ -6,19 +5,7 @@ from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, MetaEstimatorMixin, MultiOutputMixin, RegressorMixin, clone as clone -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_consistent_length as check_consistent_length, check_random_state as check_random_state -from ..utils._param_validation import ( - HasMethods as HasMethods, - Hidden as Hidden, - Interval as Interval, - Options as Options, - StrOptions as StrOptions, -) -from ..utils.random import sample_without_replacement as sample_without_replacement -from ..utils.validation import check_is_fitted as check_is_fitted, has_fit_parameter as has_fit_parameter -from ._base import LinearRegression as LinearRegression +from ..base import BaseEstimator, MetaEstimatorMixin, MultiOutputMixin, RegressorMixin # Author: Johannes Schönberger # diff --git a/stubs/sklearn/linear_model/_ridge.pyi b/stubs/sklearn/linear_model/_ridge.pyi index 12c64f40..0187442f 100644 --- a/stubs/sklearn/linear_model/_ridge.pyi +++ b/stubs/sklearn/linear_model/_ridge.pyi @@ -1,7 +1,5 @@ from abc import ABCMeta, abstractmethod from collections.abc import Iterable, Mapping -from functools import partial as partial -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar, Literal from typing_extensions import Self @@ -9,30 +7,14 @@ from numpy import ndarray from numpy.random import RandomState from pandas.core.frame import DataFrame from pandas.core.series import Series -from scipy import optimize as optimize from scipy.sparse._coo import coo_matrix from scipy.sparse._csr import csr_matrix from scipy.sparse.linalg import LinearOperator from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import MultiOutputMixin, RegressorMixin, is_classifier as is_classifier -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics import check_scoring as check_scoring, get_scorer_names as get_scorer_names -from ..model_selection import BaseCrossValidator, GridSearchCV as GridSearchCV -from ..preprocessing import LabelBinarizer as LabelBinarizer -from ..utils import ( - check_array as check_array, - check_consistent_length as check_consistent_length, - check_scalar as check_scalar, - column_or_1d as column_or_1d, - compute_sample_weight as compute_sample_weight, -) -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms, safe_sparse_dot as safe_sparse_dot -from ..utils.sparsefuncs import mean_variance_axis as mean_variance_axis -from ..utils.validation import check_is_fitted as check_is_fitted +from ..base import MultiOutputMixin, RegressorMixin +from ..model_selection import BaseCrossValidator from ._base import LinearClassifierMixin, LinearModel -from ._sag import sag_solver as sag_solver def ridge_regression( X: MatrixLike | LinearOperator, diff --git a/stubs/sklearn/linear_model/_sag.pyi b/stubs/sklearn/linear_model/_sag.pyi index 5990c9d7..8f24cc61 100644 --- a/stubs/sklearn/linear_model/_sag.pyi +++ b/stubs/sklearn/linear_model/_sag.pyi @@ -4,11 +4,6 @@ from numpy import ndarray from numpy.random.mtrand import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_array as check_array -from ..utils.extmath import row_norms as row_norms -from ._base import make_dataset as make_dataset -from ._sag_fast import sag32 as sag32, sag64 as sag64 # Authors: Tom Dupre la Tour # diff --git a/stubs/sklearn/linear_model/_stochastic_gradient.pyi b/stubs/sklearn/linear_model/_stochastic_gradient.pyi index e91d7f62..a9344812 100644 --- a/stubs/sklearn/linear_model/_stochastic_gradient.pyi +++ b/stubs/sklearn/linear_model/_stochastic_gradient.pyi @@ -1,6 +1,5 @@ from abc import ABCMeta, abstractmethod from collections.abc import Mapping -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self @@ -9,26 +8,10 @@ from numpy.random import RandomState from scipy.sparse._csr import csr_matrix from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, OutlierMixin, RegressorMixin, clone as clone, is_classifier as is_classifier -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..model_selection import ShuffleSplit as ShuffleSplit, StratifiedShuffleSplit as StratifiedShuffleSplit -from ..utils import check_random_state as check_random_state, compute_class_weight as compute_class_weight -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.metaestimators import available_if as available_if -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted -from ._base import LinearClassifierMixin, SparseCoefMixin, make_dataset as make_dataset +from ..base import BaseEstimator, OutlierMixin, RegressorMixin +from ._base import LinearClassifierMixin, SparseCoefMixin from ._sgd_fast import ( - EpsilonInsensitive as EpsilonInsensitive, - Hinge as Hinge, - Huber as Huber, - Log as Log, LossFunction, - ModifiedHuber as ModifiedHuber, - SquaredEpsilonInsensitive as SquaredEpsilonInsensitive, - SquaredHinge as SquaredHinge, - SquaredLoss as SquaredLoss, ) # Authors: Peter Prettenhofer (main author) diff --git a/stubs/sklearn/linear_model/_theil_sen.pyi b/stubs/sklearn/linear_model/_theil_sen.pyi index 68c66267..b1e63c25 100644 --- a/stubs/sklearn/linear_model/_theil_sen.pyi +++ b/stubs/sklearn/linear_model/_theil_sen.pyi @@ -1,21 +1,11 @@ -from itertools import combinations as combinations -from numbers import Integral as Integral, Real as Real from typing import ClassVar from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg -from scipy.linalg.lapack import get_lapack_funcs as get_lapack_funcs -from scipy.special import binom as binom from .._typing import ArrayLike, Float, Int from ..base import RegressorMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval -from ..utils.parallel import Parallel as Parallel, delayed as delayed from ._base import LinearModel # Author: Florian Wilhelm diff --git a/stubs/sklearn/manifold/_isomap.pyi b/stubs/sklearn/manifold/_isomap.pyi index 0b8ecc6b..7df0bbcd 100644 --- a/stubs/sklearn/manifold/_isomap.pyi +++ b/stubs/sklearn/manifold/_isomap.pyi @@ -1,21 +1,14 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy.sparse import issparse as issparse from scipy.sparse._csr import csr_matrix -from scipy.sparse.csgraph import connected_components as connected_components, shortest_path as shortest_path from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..decomposition import KernelPCA as KernelPCA -from ..neighbors import NearestNeighbors, kneighbors_graph as kneighbors_graph, radius_neighbors_graph as radius_neighbors_graph +from ..neighbors import NearestNeighbors from ..neighbors._ball_tree import BallTree from ..neighbors._kd_tree import KDTree -from ..preprocessing import KernelCenterer as KernelCenterer -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Jake Vanderplas -- # License: BSD 3 clause (C) 2011 diff --git a/stubs/sklearn/manifold/_locally_linear.pyi b/stubs/sklearn/manifold/_locally_linear.pyi index 70154cb1..4bde6b97 100644 --- a/stubs/sklearn/manifold/_locally_linear.pyi +++ b/stubs/sklearn/manifold/_locally_linear.pyi @@ -1,21 +1,14 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.linalg import qr as qr, solve as solve, svd as svd -from scipy.sparse import eye as eye from scipy.sparse._csr import csr_matrix -from scipy.sparse.linalg import LinearOperator, eigsh as eigsh +from scipy.sparse.linalg import LinearOperator from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin, _UnstableArchMixin from ..neighbors._unsupervised import NearestNeighbors -from ..utils import check_array as check_array, check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import stable_cumsum as stable_cumsum -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted def barycenter_weights(X: MatrixLike, Y: MatrixLike, indices: MatrixLike, reg: Float = 1e-3) -> ndarray: ... def barycenter_kneighbors_graph( diff --git a/stubs/sklearn/manifold/_mds.pyi b/stubs/sklearn/manifold/_mds.pyi index 382427f5..c3f072c7 100644 --- a/stubs/sklearn/manifold/_mds.pyi +++ b/stubs/sklearn/manifold/_mds.pyi @@ -1,18 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal from typing_extensions import Self -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray from numpy.random import RandomState from .._typing import Float, Int, MatrixLike from ..base import BaseEstimator -from ..isotonic import IsotonicRegression as IsotonicRegression -from ..metrics import euclidean_distances as euclidean_distances -from ..utils import check_array as check_array, check_random_state as check_random_state, check_symmetric as check_symmetric -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.parallel import Parallel as Parallel, delayed as delayed def smacof( dissimilarities: MatrixLike, diff --git a/stubs/sklearn/manifold/_spectral_embedding.pyi b/stubs/sklearn/manifold/_spectral_embedding.pyi index eced9ca1..21223274 100644 --- a/stubs/sklearn/manifold/_spectral_embedding.pyi +++ b/stubs/sklearn/manifold/_spectral_embedding.pyi @@ -1,21 +1,12 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy import sparse as sparse -from scipy.linalg import eigh as eigh from scipy.sparse._coo import coo_matrix -from scipy.sparse.csgraph import connected_components as connected_components -from scipy.sparse.linalg import eigsh as eigsh from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator -from ..metrics.pairwise import rbf_kernel as rbf_kernel -from ..neighbors import NearestNeighbors as NearestNeighbors, kneighbors_graph as kneighbors_graph -from ..utils import check_array as check_array, check_random_state as check_random_state, check_symmetric as check_symmetric -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions def spectral_embedding( adjacency: coo_matrix | MatrixLike, diff --git a/stubs/sklearn/manifold/_t_sne.pyi b/stubs/sklearn/manifold/_t_sne.pyi index 550cd94f..58dc4edc 100644 --- a/stubs/sklearn/manifold/_t_sne.pyi +++ b/stubs/sklearn/manifold/_t_sne.pyi @@ -1,21 +1,10 @@ -from numbers import Integral as Integral, Real as Real -from time import time as time from typing import Callable, ClassVar, Literal from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg -from scipy.sparse import csr_matrix as csr_matrix, issparse as issparse -from scipy.spatial.distance import pdist as pdist, squareform as squareform from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator -from ..decomposition import PCA as PCA -from ..metrics.pairwise import pairwise_distances as pairwise_distances -from ..neighbors import NearestNeighbors as NearestNeighbors -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_non_negative as check_non_negative # Author: Alexander Fabisch -- # Author: Christopher Moody diff --git a/stubs/sklearn/metrics/_base.pyi b/stubs/sklearn/metrics/_base.pyi index efa3c646..e69de29b 100644 --- a/stubs/sklearn/metrics/_base.pyi +++ b/stubs/sklearn/metrics/_base.pyi @@ -1,4 +0,0 @@ -from itertools import combinations as combinations - -from ..utils import check_array as check_array, check_consistent_length as check_consistent_length -from ..utils.multiclass import type_of_target as type_of_target diff --git a/stubs/sklearn/metrics/_classification.pyi b/stubs/sklearn/metrics/_classification.pyi index 117357de..480a140b 100644 --- a/stubs/sklearn/metrics/_classification.pyi +++ b/stubs/sklearn/metrics/_classification.pyi @@ -1,21 +1,8 @@ from typing import Literal from numpy import ndarray -from scipy.sparse import coo_matrix as coo_matrix, csr_matrix as csr_matrix -from scipy.special import xlogy as xlogy from .._typing import ArrayLike, Float, Int, MatrixLike -from ..exceptions import UndefinedMetricWarning as UndefinedMetricWarning -from ..preprocessing import LabelBinarizer as LabelBinarizer, LabelEncoder as LabelEncoder -from ..utils import ( - assert_all_finite as assert_all_finite, - check_array as check_array, - check_consistent_length as check_consistent_length, - column_or_1d as column_or_1d, -) -from ..utils._param_validation import validate_params as validate_params -from ..utils.multiclass import type_of_target as type_of_target, unique_labels as unique_labels -from ..utils.sparsefuncs import count_nonzero as count_nonzero # Authors: Alexandre Gramfort # Mathieu Blondel diff --git a/stubs/sklearn/metrics/_plot/base.pyi b/stubs/sklearn/metrics/_plot/base.pyi index 6a67b256..e69de29b 100644 --- a/stubs/sklearn/metrics/_plot/base.pyi +++ b/stubs/sklearn/metrics/_plot/base.pyi @@ -1 +0,0 @@ -from ...base import is_classifier as is_classifier diff --git a/stubs/sklearn/metrics/_plot/confusion_matrix.pyi b/stubs/sklearn/metrics/_plot/confusion_matrix.pyi index 7dbe380b..3cccb817 100644 --- a/stubs/sklearn/metrics/_plot/confusion_matrix.pyi +++ b/stubs/sklearn/metrics/_plot/confusion_matrix.pyi @@ -1,7 +1,5 @@ -from itertools import product as product from typing import Literal -import numpy as np from matplotlib.axes import Axes from matplotlib.colors import Colormap from matplotlib.figure import Figure @@ -9,9 +7,7 @@ from matplotlib.image import AxesImage from numpy import ndarray from ..._typing import ArrayLike, MatrixLike -from ...base import BaseEstimator, is_classifier as is_classifier -from ...utils import check_matplotlib_support as check_matplotlib_support -from ...utils.multiclass import unique_labels as unique_labels +from ...base import BaseEstimator class ConfusionMatrixDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/metrics/_plot/det_curve.pyi b/stubs/sklearn/metrics/_plot/det_curve.pyi index 7873b5da..37ed36d8 100644 --- a/stubs/sklearn/metrics/_plot/det_curve.pyi +++ b/stubs/sklearn/metrics/_plot/det_curve.pyi @@ -1,14 +1,11 @@ from typing import Literal -import scipy as sp from matplotlib.artist import Artist from matplotlib.axes import Axes from matplotlib.figure import Figure from ..._typing import ArrayLike, MatrixLike from ...base import BaseEstimator -from ...utils import check_matplotlib_support as check_matplotlib_support -from .. import det_curve as det_curve class DetCurveDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/metrics/_plot/precision_recall_curve.pyi b/stubs/sklearn/metrics/_plot/precision_recall_curve.pyi index b754f3d6..0c609731 100644 --- a/stubs/sklearn/metrics/_plot/precision_recall_curve.pyi +++ b/stubs/sklearn/metrics/_plot/precision_recall_curve.pyi @@ -5,10 +5,7 @@ from matplotlib.axes import Axes from matplotlib.figure import Figure from ..._typing import ArrayLike, Float, MatrixLike -from ...base import BaseEstimator, is_classifier as is_classifier -from ...utils import check_matplotlib_support as check_matplotlib_support -from .. import average_precision_score as average_precision_score, precision_recall_curve as precision_recall_curve -from .._classification import check_consistent_length as check_consistent_length +from ...base import BaseEstimator class PrecisionRecallDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/metrics/_plot/regression.pyi b/stubs/sklearn/metrics/_plot/regression.pyi index 10922a60..d5dcc99d 100644 --- a/stubs/sklearn/metrics/_plot/regression.pyi +++ b/stubs/sklearn/metrics/_plot/regression.pyi @@ -1,7 +1,5 @@ -import numbers from typing import Literal -import numpy as np from matplotlib.artist import Artist from matplotlib.axes import Axes from matplotlib.figure import Figure @@ -9,7 +7,6 @@ from numpy.random import RandomState from ..._typing import ArrayLike, MatrixLike from ...base import BaseEstimator -from ...utils import check_matplotlib_support as check_matplotlib_support, check_random_state as check_random_state class PredictionErrorDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/metrics/_plot/roc_curve.pyi b/stubs/sklearn/metrics/_plot/roc_curve.pyi index 765571ce..9422f7a5 100644 --- a/stubs/sklearn/metrics/_plot/roc_curve.pyi +++ b/stubs/sklearn/metrics/_plot/roc_curve.pyi @@ -6,8 +6,6 @@ from matplotlib.figure import Figure from ..._typing import ArrayLike, Float, MatrixLike from ...base import BaseEstimator -from ...utils import check_matplotlib_support as check_matplotlib_support -from .. import auc as auc, roc_curve as roc_curve class RocCurveDisplay: figure_: Figure = ... diff --git a/stubs/sklearn/metrics/_ranking.pyi b/stubs/sklearn/metrics/_ranking.pyi index 04e58d41..909cafc4 100644 --- a/stubs/sklearn/metrics/_ranking.pyi +++ b/stubs/sklearn/metrics/_ranking.pyi @@ -1,22 +1,8 @@ -from functools import partial as partial from typing import Literal from numpy import ndarray -from scipy.sparse import csr_matrix as csr_matrix, issparse as issparse -from scipy.stats import rankdata as rankdata from .._typing import ArrayLike, Float, Int, MatrixLike -from ..exceptions import UndefinedMetricWarning as UndefinedMetricWarning -from ..preprocessing import label_binarize as label_binarize -from ..utils import ( - assert_all_finite as assert_all_finite, - check_array as check_array, - check_consistent_length as check_consistent_length, - column_or_1d as column_or_1d, -) -from ..utils.extmath import stable_cumsum as stable_cumsum -from ..utils.multiclass import type_of_target as type_of_target -from ..utils.sparsefuncs import count_nonzero as count_nonzero # Authors: Alexandre Gramfort # Mathieu Blondel diff --git a/stubs/sklearn/metrics/_regression.pyi b/stubs/sklearn/metrics/_regression.pyi index c0cf69d3..6e81a847 100644 --- a/stubs/sklearn/metrics/_regression.pyi +++ b/stubs/sklearn/metrics/_regression.pyi @@ -2,16 +2,8 @@ from typing import Literal, overload from typing_extensions import deprecated from numpy import ndarray -from scipy.special import xlogy as xlogy from .._typing import ArrayLike, Float, MatrixLike -from ..exceptions import UndefinedMetricWarning as UndefinedMetricWarning -from ..utils.validation import ( - check_array as check_array, - check_consistent_length as check_consistent_length, - check_scalar as check_scalar, - column_or_1d as column_or_1d, -) # Authors: Alexandre Gramfort # Mathieu Blondel diff --git a/stubs/sklearn/metrics/_scorer.pyi b/stubs/sklearn/metrics/_scorer.pyi index 6a2766e0..0f2aa127 100644 --- a/stubs/sklearn/metrics/_scorer.pyi +++ b/stubs/sklearn/metrics/_scorer.pyi @@ -1,50 +1,9 @@ -from collections import Counter as Counter -from collections.abc import Iterable as Iterable -from functools import partial as partial -from traceback import format_exc as format_exc from typing import Any, Callable from numpy import ndarray from .._typing import ArrayLike, Float, MatrixLike -from ..base import BaseEstimator, is_regressor as is_regressor -from ..utils.multiclass import type_of_target as type_of_target -from . import ( - accuracy_score as accuracy_score, - average_precision_score as average_precision_score, - balanced_accuracy_score as balanced_accuracy_score, - brier_score_loss as brier_score_loss, - class_likelihood_ratios as class_likelihood_ratios, - explained_variance_score as explained_variance_score, - f1_score as f1_score, - jaccard_score as jaccard_score, - log_loss as log_loss, - matthews_corrcoef as matthews_corrcoef, - max_error as max_error, - mean_absolute_error as mean_absolute_error, - mean_absolute_percentage_error as mean_absolute_percentage_error, - mean_gamma_deviance as mean_gamma_deviance, - mean_poisson_deviance as mean_poisson_deviance, - mean_squared_error as mean_squared_error, - mean_squared_log_error as mean_squared_log_error, - median_absolute_error as median_absolute_error, - precision_score as precision_score, - r2_score as r2_score, - recall_score as recall_score, - roc_auc_score as roc_auc_score, - top_k_accuracy_score as top_k_accuracy_score, -) -from .cluster import ( - adjusted_mutual_info_score as adjusted_mutual_info_score, - adjusted_rand_score as adjusted_rand_score, - completeness_score as completeness_score, - fowlkes_mallows_score as fowlkes_mallows_score, - homogeneity_score as homogeneity_score, - mutual_info_score as mutual_info_score, - normalized_mutual_info_score as normalized_mutual_info_score, - rand_score as rand_score, - v_measure_score as v_measure_score, -) +from ..base import BaseEstimator class _MultimetricScorer: def __init__(self, *, scorers: dict, raise_exc: bool = True) -> None: ... diff --git a/stubs/sklearn/metrics/cluster/_bicluster.pyi b/stubs/sklearn/metrics/cluster/_bicluster.pyi index e6cadde5..423464e5 100644 --- a/stubs/sklearn/metrics/cluster/_bicluster.pyi +++ b/stubs/sklearn/metrics/cluster/_bicluster.pyi @@ -1,10 +1,8 @@ from typing import Callable, Literal from numpy import ndarray -from scipy.optimize import linear_sum_assignment as linear_sum_assignment from ..._typing import Float -from ...utils.validation import check_array as check_array, check_consistent_length as check_consistent_length __all__ = ["consensus_score"] diff --git a/stubs/sklearn/metrics/cluster/_supervised.pyi b/stubs/sklearn/metrics/cluster/_supervised.pyi index b0e9dfbc..7ae4c962 100644 --- a/stubs/sklearn/metrics/cluster/_supervised.pyi +++ b/stubs/sklearn/metrics/cluster/_supervised.pyi @@ -1,11 +1,7 @@ -from math import log as log - from numpy import ndarray from scipy.sparse import spmatrix from ..._typing import ArrayLike, Float, MatrixLike -from ...utils.multiclass import type_of_target as type_of_target -from ...utils.validation import check_array as check_array, check_consistent_length as check_consistent_length from ._expected_mutual_info_fast import expected_mutual_information as expected_mutual_information # Authors: Olivier Grisel diff --git a/stubs/sklearn/metrics/cluster/_unsupervised.pyi b/stubs/sklearn/metrics/cluster/_unsupervised.pyi index 8d526310..5130d0d3 100644 --- a/stubs/sklearn/metrics/cluster/_unsupervised.pyi +++ b/stubs/sklearn/metrics/cluster/_unsupervised.pyi @@ -3,9 +3,6 @@ from typing import Callable from numpy.random import RandomState from ..._typing import ArrayLike, Float, Int, MatrixLike -from ...preprocessing import LabelEncoder as LabelEncoder -from ...utils import check_random_state as check_random_state, check_X_y as check_X_y -from ..pairwise import pairwise_distances as pairwise_distances, pairwise_distances_chunked as pairwise_distances_chunked # Authors: Robert Layton # Arnaud Fouchet diff --git a/stubs/sklearn/mixture/_base.pyi b/stubs/sklearn/mixture/_base.pyi index af33b941..e5eec589 100644 --- a/stubs/sklearn/mixture/_base.pyi +++ b/stubs/sklearn/mixture/_base.pyi @@ -1,21 +1,12 @@ -from abc import ABCMeta, abstractmethod as abstractmethod -from numbers import Integral as Integral, Real as Real -from time import time as time +from abc import ABCMeta from typing import Any, ClassVar from typing_extensions import Self from numpy import ndarray from numpy.random.mtrand import RandomState -from scipy.special import logsumexp as logsumexp -from .. import cluster as cluster from .._typing import Float, Int, MatrixLike from ..base import BaseEstimator, DensityMixin -from ..cluster import kmeans_plusplus as kmeans_plusplus -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Wei Xue # Modified by Thierry Guillemot diff --git a/stubs/sklearn/mixture/_bayesian_mixture.pyi b/stubs/sklearn/mixture/_bayesian_mixture.pyi index 85478321..7e2f626a 100644 --- a/stubs/sklearn/mixture/_bayesian_mixture.pyi +++ b/stubs/sklearn/mixture/_bayesian_mixture.pyi @@ -1,13 +1,9 @@ -from numbers import Real as Real from typing import ClassVar, Literal from numpy import ndarray from numpy.random import RandomState -from scipy.special import betaln as betaln, digamma as digamma, gammaln as gammaln from .._typing import ArrayLike, Float, Int -from ..utils import check_array as check_array -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions from ._base import BaseMixture # Author: Wei Xue diff --git a/stubs/sklearn/mixture/_gaussian_mixture.pyi b/stubs/sklearn/mixture/_gaussian_mixture.pyi index f1fd664a..4328d52c 100644 --- a/stubs/sklearn/mixture/_gaussian_mixture.pyi +++ b/stubs/sklearn/mixture/_gaussian_mixture.pyi @@ -2,12 +2,8 @@ from typing import ClassVar, Literal from numpy import ndarray from numpy.random import RandomState -from scipy import linalg as linalg from .._typing import ArrayLike, Float, Int, MatrixLike -from ..utils import check_array as check_array -from ..utils._param_validation import StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms from ._base import BaseMixture # Author: Wei Xue diff --git a/stubs/sklearn/model_selection/_plot.pyi b/stubs/sklearn/model_selection/_plot.pyi index 6bea0a0b..4822fda0 100644 --- a/stubs/sklearn/model_selection/_plot.pyi +++ b/stubs/sklearn/model_selection/_plot.pyi @@ -7,8 +7,7 @@ from matplotlib.figure import Figure from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..utils import check_matplotlib_support as check_matplotlib_support -from . import BaseCrossValidator, learning_curve as learning_curve +from . import BaseCrossValidator class LearningCurveDisplay: fill_between_: Artist | None = ... diff --git a/stubs/sklearn/model_selection/_search.pyi b/stubs/sklearn/model_selection/_search.pyi index 2ff6c7b8..0dd6fb54 100644 --- a/stubs/sklearn/model_selection/_search.pyi +++ b/stubs/sklearn/model_selection/_search.pyi @@ -1,28 +1,15 @@ from abc import ABCMeta, abstractmethod -from collections import defaultdict as defaultdict from collections.abc import Iterable, Iterator, Mapping, Sequence -from functools import partial as partial, reduce as reduce -from itertools import product as product from typing import Any, Callable, ClassVar, Generic, TypeVar from typing_extensions import Self from numpy import ndarray -from numpy.ma import MaskedArray as MaskedArray from numpy.random import RandomState from scipy.sparse import spmatrix -from scipy.stats import rankdata as rankdata from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, MetaEstimatorMixin, clone as clone, is_classifier as is_classifier -from ..exceptions import NotFittedError as NotFittedError -from ..metrics import check_scoring as check_scoring -from ..utils import check_random_state as check_random_state -from ..utils.metaestimators import available_if as available_if -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.random import sample_without_replacement as sample_without_replacement -from ..utils.validation import check_is_fitted as check_is_fitted, indexable as indexable +from ..base import BaseEstimator, MetaEstimatorMixin from . import BaseCrossValidator -from ._split import check_cv as check_cv _BaseEstimatorT = TypeVar("_BaseEstimatorT", bound=BaseEstimator, default=BaseEstimator, covariant=True) diff --git a/stubs/sklearn/model_selection/_search_successive_halving.pyi b/stubs/sklearn/model_selection/_search_successive_halving.pyi index e1c78000..3398991c 100644 --- a/stubs/sklearn/model_selection/_search_successive_halving.pyi +++ b/stubs/sklearn/model_selection/_search_successive_halving.pyi @@ -1,8 +1,4 @@ -from abc import abstractmethod as abstractmethod from collections.abc import Iterable, Iterator, Mapping, Sequence -from copy import deepcopy as deepcopy -from math import ceil as ceil, floor as floor, log as log -from numbers import Integral as Integral from typing import Callable, ClassVar, Literal from typing_extensions import Self @@ -10,13 +6,10 @@ from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, is_classifier as is_classifier +from ..base import BaseEstimator from ..svm._classes import SVC -from ..utils import resample as resample -from ..utils.multiclass import check_classification_targets as check_classification_targets -from . import BaseCrossValidator, ParameterGrid as ParameterGrid, ParameterSampler as ParameterSampler +from . import BaseCrossValidator from ._search import BaseSearchCV -from ._split import check_cv as check_cv __all__ = ["HalvingGridSearchCV", "HalvingRandomSearchCV"] diff --git a/stubs/sklearn/model_selection/_split.pyi b/stubs/sklearn/model_selection/_split.pyi index 377a1a5c..a5ffd235 100644 --- a/stubs/sklearn/model_selection/_split.pyi +++ b/stubs/sklearn/model_selection/_split.pyi @@ -1,19 +1,11 @@ from abc import ABCMeta, abstractmethod -from collections import defaultdict as defaultdict from collections.abc import Iterable, Iterator -from inspect import signature as signature -from itertools import chain as chain, combinations as combinations -from math import ceil as ceil, floor as floor from typing import Any, Callable from numpy import ndarray from numpy.random import RandomState -from scipy.special import comb as comb from .._typing import ArrayLike, Float, Int, MatrixLike -from ..utils import check_random_state as check_random_state, indexable as indexable -from ..utils.multiclass import type_of_target as type_of_target -from ..utils.validation import check_array as check_array, column_or_1d as column_or_1d __all__ = [ "BaseCrossValidator", diff --git a/stubs/sklearn/model_selection/_validation.pyi b/stubs/sklearn/model_selection/_validation.pyi index 496ce7e5..ec6883fe 100644 --- a/stubs/sklearn/model_selection/_validation.pyi +++ b/stubs/sklearn/model_selection/_validation.pyi @@ -1,24 +1,13 @@ -from collections import Counter as Counter from collections.abc import Iterable, Mapping -from contextlib import suppress as suppress -from functools import partial as partial -from traceback import format_exc as format_exc from typing import Callable, Literal -from joblib import logger as logger from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, clone as clone, is_classifier as is_classifier -from ..exceptions import FitFailedWarning as FitFailedWarning -from ..metrics import check_scoring as check_scoring -from ..preprocessing import LabelEncoder as LabelEncoder +from ..base import BaseEstimator from ..svm._classes import SVC, LinearSVC -from ..utils import check_random_state as check_random_state, indexable as indexable -from ..utils.parallel import Parallel as Parallel, delayed as delayed from . import BaseCrossValidator -from ._split import check_cv as check_cv # Author: Alexandre Gramfort # Gael Varoquaux diff --git a/stubs/sklearn/neighbors/_base.pyi b/stubs/sklearn/neighbors/_base.pyi index e2436a5f..d299a2fd 100644 --- a/stubs/sklearn/neighbors/_base.pyi +++ b/stubs/sklearn/neighbors/_base.pyi @@ -6,27 +6,13 @@ # # License: BSD 3 clause (C) INRIA, University of Amsterdam from abc import ABCMeta, abstractmethod -from functools import partial as partial -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal -from joblib import effective_n_jobs as effective_n_jobs from numpy import ndarray -from scipy.sparse import csr_matrix as csr_matrix, issparse as issparse, spmatrix +from scipy.sparse import spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, MultiOutputMixin, is_classifier as is_classifier -from ..exceptions import DataConversionWarning as DataConversionWarning, EfficiencyWarning as EfficiencyWarning -from ..metrics import pairwise_distances_chunked as pairwise_distances_chunked -from ..metrics._pairwise_distances_reduction import ArgKmin as ArgKmin, RadiusNeighbors as RadiusNeighbors -from ..metrics.pairwise import PAIRWISE_DISTANCE_FUNCTIONS as PAIRWISE_DISTANCE_FUNCTIONS -from ..utils import check_array as check_array, gen_even_slices as gen_even_slices -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.parallel import Parallel as Parallel, delayed as delayed -from ..utils.validation import check_is_fitted as check_is_fitted, check_non_negative as check_non_negative -from ._ball_tree import BallTree as BallTree -from ._kd_tree import KDTree as KDTree +from ..base import BaseEstimator, MultiOutputMixin VALID_METRICS = ... diff --git a/stubs/sklearn/neighbors/_classification.pyi b/stubs/sklearn/neighbors/_classification.pyi index 74997f1a..fefa08d0 100644 --- a/stubs/sklearn/neighbors/_classification.pyi +++ b/stubs/sklearn/neighbors/_classification.pyi @@ -1,4 +1,3 @@ -from numbers import Integral as Integral from typing import Callable, ClassVar, Literal from typing_extensions import Self @@ -6,8 +5,6 @@ from numpy import ndarray from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import ClassifierMixin -from ..utils._param_validation import StrOptions as StrOptions -from ..utils.extmath import weighted_mode as weighted_mode from ._base import KNeighborsMixin, NeighborsBase, RadiusNeighborsMixin class KNeighborsClassifier(KNeighborsMixin, ClassifierMixin, NeighborsBase): diff --git a/stubs/sklearn/neighbors/_graph.pyi b/stubs/sklearn/neighbors/_graph.pyi index faa88bb7..5b3c0b14 100644 --- a/stubs/sklearn/neighbors/_graph.pyi +++ b/stubs/sklearn/neighbors/_graph.pyi @@ -6,8 +6,6 @@ from scipy.sparse import spmatrix from .._typing import Float, Int, MatrixLike from ..base import ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..utils._param_validation import StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted from ._ball_tree import BallTree from ._base import KNeighborsMixin, NeighborsBase, RadiusNeighborsMixin from ._unsupervised import NearestNeighbors diff --git a/stubs/sklearn/neighbors/_kde.pyi b/stubs/sklearn/neighbors/_kde.pyi index 17aaf9a4..cced5acd 100644 --- a/stubs/sklearn/neighbors/_kde.pyi +++ b/stubs/sklearn/neighbors/_kde.pyi @@ -1,21 +1,12 @@ -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.special import gammainc as gammainc from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator -from ..neighbors._base import VALID_METRICS as VALID_METRICS -from ..utils import check_random_state as check_random_state -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms -from ..utils.validation import check_is_fitted as check_is_fitted -from ._ball_tree import BallTree as BallTree from ._binary_tree import BinaryTree -from ._kd_tree import KDTree as KDTree # Author: Jake Vanderplas diff --git a/stubs/sklearn/neighbors/_lof.pyi b/stubs/sklearn/neighbors/_lof.pyi index a7e4b531..576fe777 100644 --- a/stubs/sklearn/neighbors/_lof.pyi +++ b/stubs/sklearn/neighbors/_lof.pyi @@ -1,4 +1,3 @@ -from numbers import Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self @@ -6,10 +5,6 @@ from numpy import ndarray from .._typing import ArrayLike, Int, MatrixLike from ..base import OutlierMixin -from ..utils import check_array as check_array -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.metaestimators import available_if as available_if -from ..utils.validation import check_is_fitted as check_is_fitted from ._base import KNeighborsMixin, NeighborsBase # Authors: Nicolas Goix diff --git a/stubs/sklearn/neighbors/_nca.pyi b/stubs/sklearn/neighbors/_nca.pyi index 40507803..0f426850 100644 --- a/stubs/sklearn/neighbors/_nca.pyi +++ b/stubs/sklearn/neighbors/_nca.pyi @@ -1,23 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar, Literal from typing_extensions import Self -from warnings import warn as warn from numpy import ndarray from numpy.random import RandomState -from scipy.optimize import minimize as minimize from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..decomposition import PCA as PCA -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics import pairwise_distances as pairwise_distances -from ..preprocessing import LabelEncoder as LabelEncoder -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import softmax as softmax -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.random import check_random_state as check_random_state -from ..utils.validation import check_array as check_array, check_is_fitted as check_is_fitted class NeighborhoodComponentsAnalysis(ClassNamePrefixFeaturesOutMixin, TransformerMixin, BaseEstimator): feature_names_in_: ndarray = ... diff --git a/stubs/sklearn/neighbors/_nearest_centroid.pyi b/stubs/sklearn/neighbors/_nearest_centroid.pyi index 126fddd6..7049cf48 100644 --- a/stubs/sklearn/neighbors/_nearest_centroid.pyi +++ b/stubs/sklearn/neighbors/_nearest_centroid.pyi @@ -1,4 +1,3 @@ -from numbers import Real as Real from typing import Callable, ClassVar from typing_extensions import Self @@ -6,12 +5,6 @@ from numpy import ndarray from .._typing import ArrayLike, Float, MatrixLike from ..base import BaseEstimator, ClassifierMixin -from ..metrics.pairwise import pairwise_distances_argmin as pairwise_distances_argmin -from ..preprocessing import LabelEncoder as LabelEncoder -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.sparsefuncs import csc_median_axis_0 as csc_median_axis_0 -from ..utils.validation import check_is_fitted as check_is_fitted # Author: Robert Layton # Olivier Grisel diff --git a/stubs/sklearn/neighbors/_regression.pyi b/stubs/sklearn/neighbors/_regression.pyi index 806c896c..15b26007 100644 --- a/stubs/sklearn/neighbors/_regression.pyi +++ b/stubs/sklearn/neighbors/_regression.pyi @@ -5,7 +5,6 @@ from numpy import ndarray from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import RegressorMixin -from ..utils._param_validation import StrOptions as StrOptions from ._base import KNeighborsMixin, NeighborsBase, RadiusNeighborsMixin # Authors: Jake Vanderplas diff --git a/stubs/sklearn/neural_network/_base.pyi b/stubs/sklearn/neural_network/_base.pyi index aa182c00..fbc6c3a4 100644 --- a/stubs/sklearn/neural_network/_base.pyi +++ b/stubs/sklearn/neural_network/_base.pyi @@ -1,5 +1,3 @@ -from scipy.special import xlogy as xlogy - from .._typing import ArrayLike, Float, MatrixLike # Author: Issam H. Laradji diff --git a/stubs/sklearn/neural_network/_multilayer_perceptron.pyi b/stubs/sklearn/neural_network/_multilayer_perceptron.pyi index 7796697e..9f201312 100644 --- a/stubs/sklearn/neural_network/_multilayer_perceptron.pyi +++ b/stubs/sklearn/neural_network/_multilayer_perceptron.pyi @@ -1,6 +1,4 @@ from abc import ABCMeta, abstractmethod -from itertools import chain as chain -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self @@ -8,19 +6,7 @@ from numpy import ndarray from numpy.random import RandomState from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, ClassifierMixin, RegressorMixin, is_classifier as is_classifier -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics import accuracy_score as accuracy_score, r2_score as r2_score -from ..model_selection import train_test_split as train_test_split -from ..preprocessing import LabelBinarizer as LabelBinarizer -from ..utils import check_random_state as check_random_state, column_or_1d as column_or_1d, gen_batches as gen_batches -from ..utils._param_validation import Interval as Interval, Options as Options, StrOptions as StrOptions -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.metaestimators import available_if as available_if -from ..utils.multiclass import type_of_target as type_of_target, unique_labels as unique_labels -from ..utils.validation import check_is_fitted as check_is_fitted -from ._base import ACTIVATIONS as ACTIVATIONS, DERIVATIVES as DERIVATIVES, LOSS_FUNCTIONS as LOSS_FUNCTIONS -from ._stochastic_optimizers import AdamOptimizer as AdamOptimizer, SGDOptimizer as SGDOptimizer +from ..base import BaseEstimator, ClassifierMixin, RegressorMixin _STOCHASTIC_SOLVERS: list = ... diff --git a/stubs/sklearn/neural_network/_rbm.pyi b/stubs/sklearn/neural_network/_rbm.pyi index 7ea18f74..9fc24e41 100644 --- a/stubs/sklearn/neural_network/_rbm.pyi +++ b/stubs/sklearn/neural_network/_rbm.pyi @@ -1,17 +1,11 @@ -from numbers import Integral as Integral, Real as Real from typing import ClassVar from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.special import expit as expit from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, TransformerMixin -from ..utils import check_random_state as check_random_state, gen_even_slices as gen_even_slices -from ..utils._param_validation import Interval as Interval -from ..utils.extmath import log_logistic as log_logistic, safe_sparse_dot as safe_sparse_dot -from ..utils.validation import check_is_fitted as check_is_fitted # Authors: Yann N. Dauphin # Vlad Niculae diff --git a/stubs/sklearn/preprocessing/_data.pyi b/stubs/sklearn/preprocessing/_data.pyi index e91c6418..a720f00a 100644 --- a/stubs/sklearn/preprocessing/_data.pyi +++ b/stubs/sklearn/preprocessing/_data.pyi @@ -1,35 +1,14 @@ -from numbers import Integral as Integral, Real as Real from typing import Any, ClassVar, Literal, overload from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState from pandas.core.series import Series -from scipy import optimize as optimize, sparse as sparse, stats as stats from scipy.sparse import spmatrix from scipy.sparse._csr import csr_matrix -from scipy.special import boxcox as boxcox from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassNamePrefixFeaturesOutMixin, OneToOneFeatureMixin, TransformerMixin -from ..utils import check_array as check_array -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import row_norms as row_norms -from ..utils.sparsefuncs import ( - incr_mean_variance_axis as incr_mean_variance_axis, - inplace_column_scale as inplace_column_scale, - mean_variance_axis as mean_variance_axis, - min_max_axis as min_max_axis, -) -from ..utils.sparsefuncs_fast import ( - inplace_csr_row_normalize_l1 as inplace_csr_row_normalize_l1, - inplace_csr_row_normalize_l2 as inplace_csr_row_normalize_l2, -) -from ..utils.validation import ( - FLOAT_DTYPES as FLOAT_DTYPES, - check_is_fitted as check_is_fitted, - check_random_state as check_random_state, -) from ._encoders import OneHotEncoder # Authors: Alexandre Gramfort diff --git a/stubs/sklearn/preprocessing/_discretization.pyi b/stubs/sklearn/preprocessing/_discretization.pyi index b92e7efa..8aa5ff7c 100644 --- a/stubs/sklearn/preprocessing/_discretization.pyi +++ b/stubs/sklearn/preprocessing/_discretization.pyi @@ -1,4 +1,3 @@ -from numbers import Integral as Integral from typing import ClassVar, Literal from typing_extensions import Self @@ -9,14 +8,6 @@ from scipy.sparse import spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, TransformerMixin -from ..cluster import KMeans as KMeans -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, Options as Options, StrOptions as StrOptions -from ..utils.validation import ( - check_array as check_array, - check_is_fitted as check_is_fitted, - check_random_state as check_random_state, -) -from . import OneHotEncoder as OneHotEncoder # Author: Henry Lin # Tom Dupré la Tour diff --git a/stubs/sklearn/preprocessing/_encoders.pyi b/stubs/sklearn/preprocessing/_encoders.pyi index ec37e4f1..15fb4bcb 100644 --- a/stubs/sklearn/preprocessing/_encoders.pyi +++ b/stubs/sklearn/preprocessing/_encoders.pyi @@ -1,5 +1,4 @@ from collections.abc import Sequence -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self @@ -9,9 +8,6 @@ from scipy.sparse import spmatrix from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, OneToOneFeatureMixin, TransformerMixin -from ..utils import check_array as check_array, is_scalar_nan as is_scalar_nan -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.validation import check_is_fitted as check_is_fitted # Authors: Andreas Mueller # Joris Van den Bossche diff --git a/stubs/sklearn/preprocessing/_function_transformer.pyi b/stubs/sklearn/preprocessing/_function_transformer.pyi index b6e20a9d..ea50717f 100644 --- a/stubs/sklearn/preprocessing/_function_transformer.pyi +++ b/stubs/sklearn/preprocessing/_function_transformer.pyi @@ -6,9 +6,6 @@ from pandas.core.frame import DataFrame from .._typing import ArrayLike, MatrixLike from ..base import BaseEstimator, TransformerMixin -from ..utils._param_validation import StrOptions as StrOptions -from ..utils.metaestimators import available_if as available_if -from ..utils.validation import check_array as check_array class FunctionTransformer(TransformerMixin, BaseEstimator): feature_names_in_: ndarray = ... diff --git a/stubs/sklearn/preprocessing/_label.pyi b/stubs/sklearn/preprocessing/_label.pyi index cdd55c3b..6b6fec07 100644 --- a/stubs/sklearn/preprocessing/_label.pyi +++ b/stubs/sklearn/preprocessing/_label.pyi @@ -1,6 +1,4 @@ -from collections import defaultdict as defaultdict from collections.abc import Iterable -from numbers import Integral as Integral from typing import Any, ClassVar from typing_extensions import Self @@ -10,10 +8,6 @@ from scipy.sparse import csr_matrix, spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, TransformerMixin -from ..utils import column_or_1d as column_or_1d -from ..utils.multiclass import type_of_target as type_of_target, unique_labels as unique_labels -from ..utils.sparsefuncs import min_max_axis as min_max_axis -from ..utils.validation import check_array as check_array, check_is_fitted as check_is_fitted # Authors: Alexandre Gramfort # Mathieu Blondel diff --git a/stubs/sklearn/preprocessing/_polynomial.pyi b/stubs/sklearn/preprocessing/_polynomial.pyi index 610ad883..af95a0f4 100644 --- a/stubs/sklearn/preprocessing/_polynomial.pyi +++ b/stubs/sklearn/preprocessing/_polynomial.pyi @@ -1,19 +1,12 @@ -from itertools import chain as chain, combinations as combinations -from numbers import Integral as Integral from typing import Any, ClassVar, Literal from typing_extensions import Self from numpy import ndarray from pandas.core.series import Series -from scipy.interpolate import BSpline as BSpline from scipy.sparse import spmatrix -from scipy.special import comb as comb from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, TransformerMixin -from ..utils import check_array as check_array -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.validation import FLOAT_DTYPES as FLOAT_DTYPES, check_is_fitted as check_is_fitted __all__ = [ "PolynomialFeatures", diff --git a/stubs/sklearn/semi_supervised/_label_propagation.pyi b/stubs/sklearn/semi_supervised/_label_propagation.pyi index 43c2aaa9..c2169764 100644 --- a/stubs/sklearn/semi_supervised/_label_propagation.pyi +++ b/stubs/sklearn/semi_supervised/_label_propagation.pyi @@ -1,21 +1,11 @@ -from abc import ABCMeta, abstractmethod as abstractmethod -from numbers import Integral as Integral, Real as Real +from abc import ABCMeta from typing import Callable, ClassVar, Literal from typing_extensions import Self from numpy import ndarray -from scipy import sparse as sparse -from scipy.sparse import csgraph as csgraph from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import BaseEstimator, ClassifierMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning -from ..metrics.pairwise import rbf_kernel as rbf_kernel -from ..neighbors import NearestNeighbors as NearestNeighbors -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.validation import check_is_fitted as check_is_fitted class BaseLabelPropagation(ClassifierMixin, BaseEstimator, metaclass=ABCMeta): _parameter_constraints: ClassVar[dict] = ... diff --git a/stubs/sklearn/semi_supervised/_self_training.pyi b/stubs/sklearn/semi_supervised/_self_training.pyi index cf3cd639..0deb77d4 100644 --- a/stubs/sklearn/semi_supervised/_self_training.pyi +++ b/stubs/sklearn/semi_supervised/_self_training.pyi @@ -1,15 +1,10 @@ -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray from .._typing import ArrayLike, Float, Int, MatrixLike -from ..base import BaseEstimator, MetaEstimatorMixin, clone as clone -from ..utils import safe_mask as safe_mask -from ..utils._param_validation import HasMethods as HasMethods, Interval as Interval, StrOptions as StrOptions -from ..utils.metaestimators import available_if as available_if -from ..utils.validation import check_is_fitted as check_is_fitted +from ..base import BaseEstimator, MetaEstimatorMixin __all__ = ["SelfTrainingClassifier"] diff --git a/stubs/sklearn/svm/_base.pyi b/stubs/sklearn/svm/_base.pyi index 9f9b04e7..25da99ce 100644 --- a/stubs/sklearn/svm/_base.pyi +++ b/stubs/sklearn/svm/_base.pyi @@ -1,5 +1,4 @@ from abc import ABCMeta, abstractmethod -from numbers import Integral as Integral, Real as Real from typing import Callable, ClassVar from typing_extensions import Self @@ -8,19 +7,6 @@ from numpy.random.mtrand import RandomState from .._typing import ArrayLike, Float, MatrixLike from ..base import BaseEstimator, ClassifierMixin -from ..exceptions import ConvergenceWarning as ConvergenceWarning, NotFittedError as NotFittedError -from ..preprocessing import LabelEncoder as LabelEncoder -from ..utils import ( - check_array as check_array, - check_random_state as check_random_state, - column_or_1d as column_or_1d, - compute_class_weight as compute_class_weight, -) -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.metaestimators import available_if as available_if -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.validation import check_consistent_length as check_consistent_length, check_is_fitted as check_is_fitted LIBSVM_IMPL: list = ... diff --git a/stubs/sklearn/svm/_bounds.pyi b/stubs/sklearn/svm/_bounds.pyi index e5d13116..593a3955 100644 --- a/stubs/sklearn/svm/_bounds.pyi +++ b/stubs/sklearn/svm/_bounds.pyi @@ -1,11 +1,6 @@ -from numbers import Real as Real from typing import Literal from .._typing import ArrayLike, Float, MatrixLike -from ..preprocessing import LabelBinarizer as LabelBinarizer -from ..utils._param_validation import Interval as Interval, StrOptions as StrOptions, validate_params as validate_params -from ..utils.extmath import safe_sparse_dot as safe_sparse_dot -from ..utils.validation import check_array as check_array, check_consistent_length as check_consistent_length def l1_min_c( X: MatrixLike | ArrayLike, diff --git a/stubs/sklearn/svm/_classes.pyi b/stubs/sklearn/svm/_classes.pyi index 9346aff3..9d54e882 100644 --- a/stubs/sklearn/svm/_classes.pyi +++ b/stubs/sklearn/svm/_classes.pyi @@ -1,5 +1,4 @@ from collections.abc import Mapping -from numbers import Integral as Integral, Real as Real from typing import Any, Callable, ClassVar, Literal from typing_extensions import Self @@ -10,8 +9,6 @@ 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 ..utils._param_validation import Interval as Interval, StrOptions as StrOptions -from ..utils.multiclass import check_classification_targets as check_classification_targets from ._base import BaseLibSVM, BaseSVC class LinearSVC(LinearClassifierMixin, SparseCoefMixin, BaseEstimator): diff --git a/stubs/sklearn/tree/_classes.pyi b/stubs/sklearn/tree/_classes.pyi index 9b299384..1b3fc447 100644 --- a/stubs/sklearn/tree/_classes.pyi +++ b/stubs/sklearn/tree/_classes.pyi @@ -1,13 +1,11 @@ from abc import ABCMeta, abstractmethod from collections.abc import Mapping, Sequence -from math import ceil as ceil -from numbers import Integral as Integral, Real as Real from typing import ClassVar, Literal from typing_extensions import Self from numpy import ndarray from numpy.random import RandomState -from scipy.sparse import issparse as issparse, spmatrix +from scipy.sparse import spmatrix from .._typing import ArrayLike, Float, Int, MatrixLike from ..base import ( @@ -15,21 +13,10 @@ from ..base import ( ClassifierMixin, MultiOutputMixin, RegressorMixin, - clone as clone, - is_classifier as is_classifier, ) -from ..utils import check_random_state as check_random_state, compute_sample_weight as compute_sample_weight from ..utils._bunch import Bunch -from ..utils._param_validation import Hidden as Hidden, Interval as Interval, StrOptions as StrOptions -from ..utils.multiclass import check_classification_targets as check_classification_targets -from ..utils.validation import check_is_fitted as check_is_fitted -from ._criterion import Criterion as Criterion -from ._splitter import Splitter as Splitter from ._tree import ( - BestFirstTreeBuilder as BestFirstTreeBuilder, - DepthFirstTreeBuilder as DepthFirstTreeBuilder, Tree, - ccp_pruning_path as ccp_pruning_path, ) # Authors: Gilles Louppe diff --git a/stubs/sklearn/tree/_export.pyi b/stubs/sklearn/tree/_export.pyi index 574c5840..94b18306 100644 --- a/stubs/sklearn/tree/_export.pyi +++ b/stubs/sklearn/tree/_export.pyi @@ -1,6 +1,4 @@ from collections.abc import Sequence -from io import StringIO as StringIO -from numbers import Integral as Integral from typing import Any, Literal from matplotlib.axes import Axes @@ -8,10 +6,8 @@ from matplotlib.text import Annotation from numpy import longlong, ndarray from .._typing import Int -from ..base import ClassifierMixin, RegressorMixin, is_classifier as is_classifier -from ..utils.validation import check_is_fitted as check_is_fitted +from ..base import ClassifierMixin, RegressorMixin from ._classes import DecisionTreeClassifier -from ._reingold_tilford import buchheim as buchheim from ._tree import Tree class Sentinel: ... diff --git a/stubs/sklearn/utils/_arpack.pyi b/stubs/sklearn/utils/_arpack.pyi index 92429701..e69de29b 100644 --- a/stubs/sklearn/utils/_arpack.pyi +++ b/stubs/sklearn/utils/_arpack.pyi @@ -1 +0,0 @@ -from .validation import check_random_state as check_random_state diff --git a/stubs/sklearn/utils/_array_api.pyi b/stubs/sklearn/utils/_array_api.pyi index d0342d69..362e653d 100644 --- a/stubs/sklearn/utils/_array_api.pyi +++ b/stubs/sklearn/utils/_array_api.pyi @@ -1,6 +1,5 @@ from numpy import int32, ndarray -from .._config import get_config as get_config from .._typing import Float class _ArrayAPIWrapper: diff --git a/stubs/sklearn/utils/_available_if.pyi b/stubs/sklearn/utils/_available_if.pyi index b75f9735..19fa7111 100644 --- a/stubs/sklearn/utils/_available_if.pyi +++ b/stubs/sklearn/utils/_available_if.pyi @@ -1,5 +1,3 @@ -from functools import update_wrapper as update_wrapper, wraps as wraps -from types import MethodType as MethodType from typing import Callable class _AvailableIfDescriptor: diff --git a/stubs/sklearn/utils/_encode.pyi b/stubs/sklearn/utils/_encode.pyi index 394dc878..ca42ae22 100644 --- a/stubs/sklearn/utils/_encode.pyi +++ b/stubs/sklearn/utils/_encode.pyi @@ -1,11 +1,8 @@ from collections import Counter -from contextlib import suppress as suppress from typing import Any, NamedTuple from numpy import ndarray, str_ -from . import is_scalar_nan as is_scalar_nan - class MissingValues(NamedTuple): nan: bool = ... none: bool = ... diff --git a/stubs/sklearn/utils/_estimator_html_repr.pyi b/stubs/sklearn/utils/_estimator_html_repr.pyi index f2ea7183..87aed00a 100644 --- a/stubs/sklearn/utils/_estimator_html_repr.pyi +++ b/stubs/sklearn/utils/_estimator_html_repr.pyi @@ -1,11 +1,6 @@ from collections.abc import Sequence -from contextlib import closing as closing -from inspect import isclass as isclass -from io import StringIO as StringIO -from string import Template as Template from typing import Literal -from .. import config_context as config_context from ..base import BaseEstimator class _IDCounter: diff --git a/stubs/sklearn/utils/_mask.pyi b/stubs/sklearn/utils/_mask.pyi index acd74bd5..e69de29b 100644 --- a/stubs/sklearn/utils/_mask.pyi +++ b/stubs/sklearn/utils/_mask.pyi @@ -1,3 +0,0 @@ -from contextlib import suppress as suppress - -from . import is_scalar_nan as is_scalar_nan diff --git a/stubs/sklearn/utils/_mocking.pyi b/stubs/sklearn/utils/_mocking.pyi index c16bb67f..ae7eb390 100644 --- a/stubs/sklearn/utils/_mocking.pyi +++ b/stubs/sklearn/utils/_mocking.pyi @@ -6,7 +6,6 @@ from numpy import ndarray from .._typing import ArrayLike, Int, MatrixLike from ..base import BaseEstimator, ClassifierMixin -from .validation import check_array as check_array, check_is_fitted as check_is_fitted class ArraySlicingWrapper: def __init__(self, array) -> None: ... diff --git a/stubs/sklearn/utils/_param_validation.pyi b/stubs/sklearn/utils/_param_validation.pyi index 645dc7db..8e153a26 100644 --- a/stubs/sklearn/utils/_param_validation.pyi +++ b/stubs/sklearn/utils/_param_validation.pyi @@ -1,11 +1,8 @@ from abc import ABC, abstractmethod -from collections.abc import Iterable as Iterable, Mapping, Sequence -from inspect import signature as signature +from collections.abc import Mapping, Sequence from numbers import Integral, Real from typing import Any, Callable, Literal -from scipy.sparse import csr_matrix as csr_matrix, issparse as issparse - from .._typing import Float class InvalidParameterError(ValueError, TypeError): ... diff --git a/stubs/sklearn/utils/_pprint.pyi b/stubs/sklearn/utils/_pprint.pyi index 9d949a18..806d5cc5 100644 --- a/stubs/sklearn/utils/_pprint.pyi +++ b/stubs/sklearn/utils/_pprint.pyi @@ -1,11 +1,6 @@ import pprint -from collections import OrderedDict as OrderedDict from typing import Any -from .._config import get_config as get_config -from ..base import BaseEstimator as BaseEstimator -from . import is_scalar_nan as is_scalar_nan - # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Python Software Foundation; # All Rights Reserved diff --git a/stubs/sklearn/utils/_set_output.pyi b/stubs/sklearn/utils/_set_output.pyi index 25c6dc75..234e7fc3 100644 --- a/stubs/sklearn/utils/_set_output.pyi +++ b/stubs/sklearn/utils/_set_output.pyi @@ -1,12 +1,6 @@ -from functools import wraps as wraps from typing import Literal -from scipy.sparse import issparse as issparse - -from .._config import get_config as get_config from ..base import BaseEstimator -from . import check_pandas_support as check_pandas_support -from ._available_if import available_if as available_if class _SetOutputMixin: def __init_subclass__(cls, auto_wrap_output_keys: None | tuple[str] = ..., **kwargs) -> None: ... diff --git a/stubs/sklearn/utils/_testing.pyi b/stubs/sklearn/utils/_testing.pyi index 5ee289a6..dd86cf68 100644 --- a/stubs/sklearn/utils/_testing.pyi +++ b/stubs/sklearn/utils/_testing.pyi @@ -10,17 +10,8 @@ import contextlib # Giorgio Patrini # Thierry Guillemot # License: BSD 3 clause -from collections.abc import Iterable as Iterable, Sequence -from functools import wraps as wraps -from inspect import signature as signature -from subprocess import ( - STDOUT as STDOUT, - CalledProcessError as CalledProcessError, - TimeoutExpired as TimeoutExpired, - check_output as check_output, -) +from collections.abc import Sequence from typing import Any, Callable, ClassVar -from unittest import TestCase as TestCase from numpy import ndarray from numpy.random import RandomState @@ -33,10 +24,6 @@ from numpy.testing import ( ) from .._typing import ArrayLike, Float, Int, MatrixLike -from ..metrics import accuracy_score as accuracy_score, r2_score as r2_score -from . import IS_PYPY as IS_PYPY -from .multiclass import check_classification_targets as check_classification_targets -from .validation import check_array as check_array, check_is_fitted as check_is_fitted, check_X_y as check_X_y __all__ = [ "assert_raises", diff --git a/utils/README.md b/utils/README.md index dbe8ef73..39f20be3 100644 --- a/utils/README.md +++ b/utils/README.md @@ -2,11 +2,15 @@ This folder contains a couple of scripts that may be useful when creating stubs. -- count_ids.py will count the occurrence of identifiers across a set of files. With --uniq it will out the IDs that occurred +- `count_ids.py` will count the occurrence of identifiers across a set of files. With --uniq it will out the IDs that occurred once only, including their location and context. This can be useful to find classes and functions in the stubs that are - defined but never referenced, in cases where all top-level imports of functions/classes are explicit (i.e. where the + defined but never referenced, in cases where all top-level imports of functions/classes are explicit (i.e. where the imports are not of the form "import module as m" but of the form "from module import class as c, function as f"). -- validate_stubs.py is a basic stub validator, that looks primarily for signature mismatches and missing methods. It gathers +- `remove_private_re_exports.py` applies Ruff's + [useless-import-alias (PLC0414)](https://docs.astral.sh/ruff/rules/useless-import-alias/#useless-import-alias-plc0414) + \+ [unused-import (F401)](https://docs.astral.sh/ruff/rules/unused-import/) + on stubs files. Normally `useless-import-alias` only applies to `.py`. So this is achieved by temporarily renaming all private module type stubs. +- `validate_stubs.py` is a basic stub validator, that looks primarily for signature mismatches and missing methods. It gathers information about overloads but does not use that yet. It is limited in use because it imports .pyi files as Python, and so is much more likely to break in the presence of circular imports, etc. But it may be worth running on your stubs. The easiest way to do so is to change into this directory in your copy of the repo and just use `python validate_stubs.py `. diff --git a/utils/remove_private_re_exports.py b/utils/remove_private_re_exports.py new file mode 100644 index 00000000..6e77935d --- /dev/null +++ b/utils/remove_private_re_exports.py @@ -0,0 +1,52 @@ +""" +Applies Ruff's +[useless-import-alias (PLC0414)](https://docs.astral.sh/ruff/rules/useless-import-alias/#useless-import-alias-plc0414) ++ [unused-import (F401)](https://docs.astral.sh/ruff/rules/unused-import/) +on stubs files. Normally `useless-import-alias` only applies to `.py`. +So this is achieved by temporarily renaming all private module type stubs. + +This isn't necessarily perfect, and temporarily renaming tons of files could be brittle, +so is offered as a tool rather than a test. +""" + +import sys +from pathlib import Path +from subprocess import check_call + +root = Path(__file__).parent.parent +ruff_cmd = (sys.executable, "-m", "ruff") + + +def main() -> None: + paths = [ + path + for path in (root / "stubs").rglob("*.pyi") + if path.name != "__init__.pyi" and any(part.startswith("_") for part in path.parts) + ] + + for path in paths: + path.rename(path.with_suffix(".py")) + + check_call( + ( + *ruff_cmd, + "check", + "--fix", + "--unsafe-fixes", + "--select=PLC0414,F401", + # Because of the current lint.per-file-ignores configuration, + # F401 currently doesn't apply to modules that are private because of a folder name + # ie: stubs/_foo/bar.py(i) + "--per-file-ignores=!*.py:F401", + ) + ) + + for path in paths: + path.with_suffix(".py").rename(path) + + check_call((*ruff_cmd, "check", "--fix")) + check_call((*ruff_cmd, "format")) + + +if __name__ == "__main__": + main()