Merge branch 'main' into Update-automated-tests

stubs/sklearn/externals/_packaging/version.pyi

@@ -1,8 +1,4 @@
-import collections
-import itertools
-import re
-import warnings
-from typing import ClassVar, Optional, Tuple, Union
+from typing import Callable, ClassVar, Optional, Tuple, Union
 
 from ._structures import (
     Infinity as Infinity,
@@ -37,13 +33,23 @@ from ._structures import (
 
 __all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"]
 
-InfiniteTypes = ...
-PrePostDevType = ...
-SubLocalType = ...
-LocalType = ...
-CmpKey = ...
-LegacyCmpKey = ...
-VersionComparisonMethod = ...
+InfiniteTypes = Union[InfinityType, NegativeInfinityType]
+PrePostDevType = Union[InfiniteTypes, Tuple[str, int]]
+SubLocalType = Union[InfiniteTypes, int, str]
+LocalType = Union[
+    NegativeInfinityType,
+    Tuple[
+        Union[
+            SubLocalType,
+            Tuple[SubLocalType, str],
+            Tuple[NegativeInfinityType, SubLocalType],
+        ],
+        ...,
+    ],
+]
+CmpKey = Tuple[int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType]
+LegacyCmpKey = Tuple[int, Tuple[str, ...]]
+VersionComparisonMethod = Callable[[Union[CmpKey, LegacyCmpKey], Union[CmpKey, LegacyCmpKey]], bool]
 
 _Version = ...
 

stubs/sklearn/preprocessing/_polynomial.pyi

@@ -67,6 +67,7 @@ class SplineTransformer(TransformerMixin, BaseEstimator):
         extrapolation: Literal["error", "constant", "linear", "continue", "periodic", "constant"] = "constant",
         include_bias: bool = True,
         order: Literal["C", "F", "C"] = "C",
+        sparse_output: bool = False,
     ) -> None: ...
     def get_feature_names_out(self, input_features: None | ArrayLike = None) -> ndarray: ...
     def fit(

stubs/sympy-stubs/algebras/quaternion.pyi

@@ -1,7 +1,7 @@
 from types import NotImplementedType
-from typing import Any, Literal, Self
+from typing import Any, Literal
+from typing_extensions import Self
 
-from sympy.core.basic import Basic
 from sympy.core.expr import Expr
 from sympy.core.function import UndefinedFunction
 from sympy.core.power import Pow

stubs/sympy-stubs/assumptions/assume.pyi

@@ -1,5 +1,6 @@
 from contextlib import contextmanager
-from typing import Any, Callable, Generator, Self
+from typing import Any, Callable, Generator
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 from sympy.logic.boolalg import Boolean

stubs/sympy-stubs/assumptions/cnf.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 from sympy.core.logic import And
 

stubs/sympy-stubs/assumptions/handlers/common.pyi

@@ -1,4 +1,5 @@
-from typing import Literal, Self
+from typing import Literal
+from typing_extensions import Self
 
 from sympy.assumptions import AppliedPredicate
 from sympy.assumptions.predicates.common import CommutativePredicate, IsTruePredicate

stubs/sympy-stubs/assumptions/predicates/matrices.pyi

@@ -1,4 +1,4 @@
-from typing import LiteralString
+from typing_extensions import LiteralString
 
 from sympy.assumptions import Predicate
 from sympy.multipledispatch import Dispatcher

stubs/sympy-stubs/assumptions/predicates/ntheory.pyi

@@ -1,4 +1,4 @@
-from typing import LiteralString
+from typing_extensions import LiteralString
 
 from sympy.assumptions import Predicate
 from sympy.multipledispatch import Dispatcher

stubs/sympy-stubs/assumptions/predicates/order.pyi

@@ -1,4 +1,4 @@
-from typing import Any, LiteralString
+from typing_extensions import LiteralString
 
 from sympy.assumptions import Predicate
 from sympy.multipledispatch import Dispatcher

stubs/sympy-stubs/assumptions/relation/binrel.pyi

@@ -1,4 +1,5 @@
-from typing import Optional, Self
+from typing import Optional
+from typing_extensions import Self
 
 from sympy.assumptions import AppliedPredicate, Predicate
 from sympy.core.basic import Basic

stubs/sympy-stubs/assumptions/wrapper.pyi

@@ -1,4 +1,5 @@
-from typing import Callable, Self
+from typing import Callable
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 

stubs/sympy-stubs/calculus/accumulationbounds.pyi

@@ -1,5 +1,5 @@
 from types import NotImplementedType
-from typing import Self
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 from sympy.core.expr import Expr

stubs/sympy-stubs/categories/baseclasses.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 from sympy.core import Basic, Symbol
 from sympy.sets import Set

stubs/sympy-stubs/codegen/ast.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable, Iterator, Literal, Self
+from typing import Any, Callable, Iterator, Literal
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 from sympy.core.expr import Atom, Expr

stubs/sympy-stubs/codegen/cnodes.pyi

@@ -1,4 +1,4 @@
-from typing import Self
+from typing_extensions import Self
 
 from sympy.codegen.ast import FunctionCall, Node, String, Token
 from sympy.core.basic import Basic

stubs/sympy-stubs/codegen/fnodes.pyi

@@ -1,5 +1,5 @@
 from ast import Attribute
-from typing import Self
+from typing_extensions import Self
 
 from sympy.codegen.ast import FunctionCall, Node, String, Token, Variable
 from sympy.core.basic import Basic

stubs/sympy-stubs/combinatorics/coset_table.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 from sympy.printing.defaults import DefaultPrinting
 

stubs/sympy-stubs/combinatorics/fp_groups.pyi

@@ -1,4 +1,5 @@
 from typing import Any, Callable
+from typing_extensions import Unpack
 
 from sympy.combinatorics.coset_table import CosetTable
 from sympy.combinatorics.free_groups import FreeGroupElement
@@ -7,7 +8,7 @@ from sympy.printing.defaults import DefaultPrinting
 from sympy.utilities import public
 
 @public
-def fp_group(fr_grp, relators=...) -> tuple[FpGroup, *tuple[Any, ...]]: ...
+def fp_group(fr_grp, relators=...) -> tuple[FpGroup, Unpack[tuple[Any, ...]]]: ...
 @public
 def xfp_group(fr_grp, relators=...) -> tuple[FpGroup, Callable[[], Any]]: ...
 @public

stubs/sympy-stubs/combinatorics/free_groups.pyi

@@ -1,13 +1,14 @@
 from types import NotImplementedType
-from typing import Any, Literal, Self
+from typing import Any, Literal
+from typing_extensions import Self, Unpack
 
 from sympy.core.expr import Expr
 from sympy.core.sympify import CantSympify
 from sympy.printing.defaults import DefaultPrinting
 from sympy.utilities import public
 
 @public
-def free_group(symbols) -> tuple[FreeGroup, *tuple[Any, ...]]: ...
+def free_group(symbols) -> tuple[FreeGroup, Unpack[tuple[Any, ...]]]: ...
 @public
 def xfree_group(symbols) -> tuple[FreeGroup, Any]: ...
 @public

stubs/sympy-stubs/combinatorics/graycode.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Generator, LiteralString, Self
+from typing import Any, Generator
+from typing_extensions import LiteralString, Self
 
 from sympy.core import Basic
 

stubs/sympy-stubs/combinatorics/partitions.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Literal, LiteralString, Self
+from typing import Any, Literal
+from typing_extensions import LiteralString, Self
 
 from sympy.core import Basic
 from sympy.core.function import UndefinedFunction

stubs/sympy-stubs/combinatorics/perm_groups.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Generator, Literal, Self
+from typing import Any, Generator, Literal
+from typing_extensions import Self
 
 from sympy.combinatorics.fp_groups import FpGroup
 from sympy.combinatorics.pc_groups import PolycyclicGroup

stubs/sympy-stubs/combinatorics/permutations.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Generator, Literal, Self
+from typing import Any, Generator, Literal
+from typing_extensions import Self
 
 from sympy.combinatorics.perm_groups import Coset
 from sympy.core.basic import Atom

stubs/sympy-stubs/combinatorics/polyhedron.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 from sympy.core import Basic
 from sympy.sets.sets import FiniteSet

stubs/sympy-stubs/combinatorics/prufer.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Literal, Self
+from typing import Any, Literal
+from typing_extensions import Self
 
 from sympy.core import Basic
 

stubs/sympy-stubs/combinatorics/rewritingsystem_fsm.pyi

@@ -1,4 +1,4 @@
-from typing import LiteralString
+from typing_extensions import LiteralString
 
 class State:
     def __init__(self, name, state_machine, state_type=..., rh_rule=...) -> None: ...

stubs/sympy-stubs/combinatorics/subsets.pyi

@@ -1,5 +1,6 @@
 from itertools import combinations
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 class Subset:
     _rank_binary = ...

stubs/sympy-stubs/concrete/expr_with_intlimits.pyi

@@ -1,4 +1,4 @@
-from typing import Self
+from typing_extensions import Self
 
 from sympy.concrete.expr_with_limits import ExprWithLimits
 

stubs/sympy-stubs/concrete/expr_with_limits.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 from sympy.core.expr import Expr

stubs/sympy-stubs/concrete/products.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self, Tuple as tTuple
+from typing import Any
+from typing_extensions import Self, Tuple as tTuple
 
 from sympy.concrete.expr_with_intlimits import ExprWithIntLimits
 from sympy.core.basic import Basic

stubs/sympy-stubs/concrete/summations.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self, Tuple as tTuple
+from typing import Any
+from typing_extensions import Self, Tuple as tTuple
 
 from sympy.concrete.expr_with_intlimits import ExprWithIntLimits
 from sympy.concrete.expr_with_limits import AddWithLimits

stubs/sympy-stubs/core/add.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Literal, Self, Tuple as tTuple
+from typing import Any, Literal
+from typing_extensions import Self, Tuple as tTuple
 
 from sympy.core.cache import cacheit
 from sympy.core.expr import Expr

stubs/sympy-stubs/core/assumptions.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Self
+from typing import Any
+from typing_extensions import Self
 
 from sympy.core.facts import FactKB
 

stubs/sympy-stubs/core/basic.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Literal, Self
+from typing import Any, Literal
+from typing_extensions import Self
 
 from sympy import Symbol
 from sympy.core._print_helpers import Printable

stubs/sympy-stubs/core/containers.pyi

@@ -1,6 +1,7 @@
 from collections.abc import MutableSet
 from types import NotImplementedType
-from typing import Any, Callable, Generator, Iterator, Self
+from typing import Any, Callable, Generator, Iterator
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 from sympy.core.kind import Kind

stubs/sympy-stubs/core/evalf.pyi

@@ -1,16 +1,4 @@
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict as tDict,
-    List,
-    Optional,
-    Self,
-    Tuple as tTuple,
-    Type,
-    Union as tUnion,
-    overload,
-)
+from typing import Any, Callable, Dict as tDict, List, Optional, Self, Tuple as tTuple, Type, Union as tUnion, overload
 
 from mpmath import mpc, mpf
 from sympy.concrete.products import Product
@@ -27,8 +15,6 @@ from sympy.functions.elementary.integers import ceiling, floor
 from sympy.functions.elementary.trigonometric import atan
 from sympy.integrals.integrals import Integral
 
-if TYPE_CHECKING:
-    ...
 LG10 = ...
 rnd = ...
 

stubs/sympy-stubs/core/expr.pyi

@@ -1,5 +1,6 @@
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any, Literal, Self
+from typing import Any, Literal
+from typing_extensions import Self
 
 from sympy import Derivative, Equality, Integer, Mul, Order, Pow
 from sympy.core.basic import Atom, Basic
@@ -13,9 +14,6 @@ from sympy.series.formal import FormalPowerSeries
 from sympy.series.fourier import FiniteFourierSeries, FourierSeries
 from sympy.tensor.array.array_derivatives import ArrayDerivative
 
-if TYPE_CHECKING:
-    ...
-
 @sympify_method_args
 class Expr(Basic, EvalfMixin):
     __slots__: tuple[str, ...] = ...

stubs/sympy-stubs/core/exprtools.pyi

@@ -1,5 +1,6 @@
 from types import NotImplementedType
-from typing import Any, Dict, LiteralString, Tuple as tTuple
+from typing import Any, Dict, Tuple as tTuple
+from typing_extensions import LiteralString
 
 from sympy import Order
 from sympy.core.add import Add

stubs/sympy-stubs/core/function.pyi

@@ -1,6 +1,7 @@
 from inspect import Signature
 from types import NotImplementedType
-from typing import Any, Callable, Dict, Literal, Self
+from typing import Any, Callable, Dict, Literal
+from typing_extensions import Self
 
 from sympy.core.basic import Basic
 from sympy.core.cache import cacheit

stubs/sympy-stubs/core/kind.pyi

@@ -1,4 +1,5 @@
-from typing import Callable, Literal, LiteralString, Self
+from typing import Callable, Literal
+from typing_extensions import LiteralString, Self
 
 from sympy.core.cache import cacheit
 

stubs/sympy-stubs/core/logic.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Optional, Self
+from typing import Any, Optional
+from typing_extensions import Self
 
 FuzzyBool = Optional[bool]
 

stubs/sympy-stubs/core/mul.pyi

@@ -1,5 +1,6 @@
 from collections import defaultdict
-from typing import Any, Literal, Self, Tuple as tTuple
+from typing import Any, Literal
+from typing_extensions import Self, Tuple as tTuple
 
 from sympy.core.cache import cacheit
 from sympy.core.expr import Expr

stubs/sympy-stubs/core/numbers.pyi

@@ -1,14 +1,14 @@
 from functools import lru_cache
 from types import NotImplementedType
-from typing import Any, Literal, Self, Tuple
+from typing import Any, Literal
+from typing_extensions import Self, Tuple
 
 from sympy.core.basic import Basic
 from sympy.core.cache import cacheit
 from sympy.core.decorators import _sympifyit
 from sympy.core.expr import AtomicExpr, Expr
 from sympy.core.mul import Mul
 from sympy.core.singleton import Singleton
-from sympy.external.gmpy import gmpy
 from sympy.series.order import Order
 
 _LOG2 = ...