Resolve UP043 TODO

pyproject.toml

@@ -70,7 +70,6 @@ ignore = [
 
     # TODO: Investigate and fix or configure
     "PYI051", # Request for autofix: https://github.com/astral-sh/ruff/issues/14185
-    "UP043", # Manually simplify generator types first
 
     ###
     # Rules we don't want or don't agree with

stubs/matplotlib/animation.pyi

@@ -39,7 +39,7 @@ class AbstractMovieWriter(abc.ABC):
     @abc.abstractmethod
     def finish(self) -> None: ...
     @contextlib.contextmanager
-    def saving(self, fig: Figure, outfile, dpi: float, *args, **kwargs) -> Generator[AbstractMovieWriter, None, None]: ...
+    def saving(self, fig: Figure, outfile, dpi: float, *args, **kwargs) -> Generator[AbstractMovieWriter]: ...
 
 class MovieWriter(AbstractMovieWriter):
     frame_format: str

stubs/matplotlib/pyplot.pyi

@@ -779,7 +779,7 @@ def tick_params(axis: Literal["x", "y", "both"] = ..., **kwargs): ...
 def ticklabel_format(
     *,
     axis: Literal["x", "y", "both"] = ...,
-    style: Literal["sci", "scientific", "plain"] = ...,  # noqa: F811
+    style: Literal["sci", "scientific", "plain"] = ...,
     scilimits=...,
     useOffset: bool | float = ...,
     useLocale: bool = ...,

stubs/sklearn/_config.pyi

@@ -33,4 +33,4 @@ def config_context(
     transform_output: None | str = None,
     enable_metadata_routing: None | bool = None,
     skip_parameter_validation: None | bool = None,
-) -> Generator[None, None, None]: ...
+) -> Generator[None]: ...

stubs/sympy-stubs/assumptions/assume.pyi

@@ -53,4 +53,4 @@ class UndefinedPredicate(Predicate):
     def eval(self, args, assumptions=...) -> Any | None: ...
 
 @contextmanager
-def assuming(*assumptions) -> Generator[None, Any, None]: ...
+def assuming(*assumptions) -> Generator[None]: ...

stubs/sympy-stubs/combinatorics/generators.pyi

@@ -3,9 +3,9 @@ from typing import Any
 
 from sympy.combinatorics.permutations import Permutation
 
-def symmetric(n) -> Generator[Permutation, Any, None]: ...
-def cyclic(n) -> Generator[Permutation, Any, None]: ...
-def alternating(n) -> Generator[Permutation, Any, None]: ...
-def dihedral(n) -> Generator[Permutation, Any, None]: ...
+def symmetric(n) -> Generator[Permutation]: ...
+def cyclic(n) -> Generator[Permutation]: ...
+def alternating(n) -> Generator[Permutation]: ...
+def dihedral(n) -> Generator[Permutation]: ...
 def rubik_cube_generators() -> list[Permutation]: ...
 def rubik(n) -> list[Any]: ...

stubs/sympy-stubs/combinatorics/graycode.pyi

@@ -14,7 +14,7 @@ class GrayCode(Basic):
     def selections(self): ...
     @property
     def n(self) -> Basic: ...
-    def generate_gray(self, **hints) -> Generator[str, Any, None]: ...
+    def generate_gray(self, **hints) -> Generator[str]: ...
     def skip(self) -> None: ...
     @property
     def rank(self) -> int: ...
@@ -27,4 +27,4 @@ def random_bitstring(n) -> str: ...
 def gray_to_bin(bin_list) -> LiteralString: ...
 def bin_to_gray(bin_list) -> LiteralString: ...
 def get_subset_from_bitstring(super_set, bitstring) -> list[Any]: ...
-def graycode_subsets(gray_code_set) -> Generator[list[Any], Any, None]: ...
+def graycode_subsets(gray_code_set) -> Generator[list[Any]]: ...

stubs/sympy-stubs/combinatorics/perm_groups.pyi

@@ -51,11 +51,9 @@ class PermutationGroup(Basic):
     def derived_subgroup(self) -> PermutationGroup | None: ...
     def generate(
         self, method=..., af=...
-    ) -> (
-        Generator[Any | Basic | list[Any] | Permutation, Any, None] | Generator[list[int] | Permutation | list[Any], Any, None]
-    ): ...
-    def generate_dimino(self, af=...) -> Generator[list[int] | Permutation | list[Any], Any, None]: ...
-    def generate_schreier_sims(self, af=...) -> Generator[Any | Basic | list[Any] | Permutation, Any, None]: ...
+    ) -> Generator[Any | Basic | list[Any] | Permutation] | Generator[list[int] | Permutation | list[Any]]: ...
+    def generate_dimino(self, af=...) -> Generator[list[int] | Permutation | list[Any]]: ...
+    def generate_schreier_sims(self, af=...) -> Generator[Any | Basic | list[Any] | Permutation]: ...
     @property
     def generators(self) -> list[Basic]: ...
     def contains(self, g, strict=...) -> bool: ...

stubs/sympy-stubs/core/parameters.pyi

@@ -10,6 +10,6 @@ class _global_parameters(local):
 global_parameters = ...
 
 @contextmanager
-def evaluate(x) -> Generator[None, Any, None]: ...
+def evaluate(x) -> Generator[None]: ...
 @contextmanager
-def distribute(x) -> Generator[None, Any, None]: ...
+def distribute(x) -> Generator[None]: ...

stubs/sympy-stubs/core/sorting.pyi

@@ -9,4 +9,4 @@ def default_sort_key(
     tuple[tuple[Literal[5], Literal[0], str], tuple[int, tuple[Any, ...]], Any, Any]
     | tuple[tuple[Literal[10, 0], Literal[0], str | Any], tuple[int, tuple[Any, ...]] | tuple[Literal[1], tuple[str]], Any, Any]
 ): ...
-def ordered(seq, keys=..., default=..., warn=...) -> Generator[Any, Any, None]: ...
+def ordered(seq, keys=..., default=..., warn=...) -> Generator[Any]: ...

stubs/sympy-stubs/core/traversal.pyi

@@ -4,8 +4,8 @@ from typing_extensions import Self
 
 from sympy.core.basic import Basic
 
-def iterargs(expr) -> Generator[Any, Any, None]: ...
-def iterfreeargs(expr, _first=...) -> Generator[Any, Any, None]: ...
+def iterargs(expr) -> Generator[Any]: ...
+def iterfreeargs(expr, _first=...) -> Generator[Any]: ...
 
 class preorder_traversal:
     def __init__(self, node, keys=...) -> None: ...
@@ -14,6 +14,6 @@ class preorder_traversal:
     def __iter__(self) -> Self: ...
 
 def use(expr, func, level=..., args=..., kwargs=...): ...
-def walk(e, *target) -> Generator[Any, Any, None]: ...
+def walk(e, *target) -> Generator[Any]: ...
 def bottom_up(rv, F, atoms=..., nonbasic=...): ...
-def postorder_traversal(node, keys=...) -> Generator[Any | Basic, Any, None]: ...
+def postorder_traversal(node, keys=...) -> Generator[Any | Basic]: ...

stubs/sympy-stubs/logic/algorithms/dpll2.pyi

@@ -3,7 +3,7 @@ from typing import Any, Literal
 
 def dpll_satisfiable(
     expr, all_models=...
-) -> Generator[bool, None, None] | Generator[Any | Literal[False], Any, None] | dict[Any, Any] | Literal[False]: ...
+) -> Generator[bool] | Generator[Any | Literal[False]] | dict[Any, Any] | Literal[False]: ...
 
 class SATSolver:
     def __init__(

stubs/sympy-stubs/logic/algorithms/minisat22_wrapper.pyi

@@ -1,8 +1,6 @@
 from collections.abc import Generator
-from typing import Any, Literal, NoReturn
+from typing import Any, Literal
 
 def minisat22_satisfiable(
     expr, all_models=..., minimal=...
-) -> (
-    Generator[bool, None, None] | dict[Any, Any] | Generator[dict[Any, Any] | Literal[False], Any, NoReturn] | Literal[False]
-): ...
+) -> Generator[bool] | Generator[dict[Any, Any] | Literal[False]] | dict[Any, Any] | Literal[False]: ...

stubs/sympy-stubs/logic/algorithms/pycosat_wrapper.pyi

@@ -3,4 +3,4 @@ from typing import Any, Literal
 
 def pycosat_satisfiable(
     expr, all_models=...
-) -> Generator[bool, None, None] | dict[Any, Any] | Generator[dict[Any, Any] | Literal[False], Any, None] | Literal[False]: ...
+) -> Generator[bool] | dict[Any, Any] | Generator[dict[Any, Any] | Literal[False]] | Literal[False]: ...

stubs/sympy-stubs/logic/boolalg.pyi

@@ -187,7 +187,7 @@ integer_to_term = ...
 
 def truth_table(
     expr, variables, input=...
-) -> Generator[tuple[list[Literal[0, 1]], Any | BooleanFunction] | Any | BooleanFunction, Any, None]: ...
+) -> Generator[tuple[list[Literal[0, 1]], Any | BooleanFunction] | Any | BooleanFunction]: ...
 def SOPform(variables, minterms, dontcares=...) -> BooleanFalse | Or: ...
 def POSform(variables, minterms, dontcares=...) -> BooleanFalse | And: ...
 def ANFform(variables, truthvalues) -> BooleanFalse | Not | Xor: ...

stubs/sympy-stubs/logic/inference.pyi

@@ -1,15 +1,14 @@
 from collections.abc import Generator
-from typing import Any, Literal, NoReturn
+from typing import Any, Literal
 
 def literal_symbol(literal) -> bool: ...
 def satisfiable(
     expr, algorithm=..., all_models=..., minimal=...
 ) -> (
     dict[Any, Any]
-    | Generator[bool, None, None]
-    | Generator[Any | Literal[False], Any, None]
-    | Generator[dict[Any, Any] | Literal[False], Any, None]
-    | Generator[dict[Any, Any] | Literal[False], Any, NoReturn]
+    | Generator[bool]
+    | Generator[Any | Literal[False]]
+    | Generator[dict[Any, Any] | Literal[False]]
     | Literal[False]
 ): ...
 def valid(expr) -> bool: ...

stubs/sympy-stubs/matrices/utilities.pyi

@@ -9,4 +9,4 @@ class DotProdSimpState(local):
 _dotprodsimp_state = ...
 
 @contextmanager
-def dotprodsimp(x) -> Generator[None, Any, None]: ...
+def dotprodsimp(x) -> Generator[None]: ...

stubs/sympy-stubs/multipledispatch/dispatcher.pyi

@@ -34,7 +34,7 @@ class Dispatcher:
 
     __repr__ = ...
     def dispatch(self, *types) -> None: ...
-    def dispatch_iter(self, *types) -> Generator[Any, Any, None]: ...
+    def dispatch_iter(self, *types) -> Generator[Any]: ...
     def resolve(self, types) -> None: ...
     def __getstate__(self) -> dict[str, Any]: ...
     def __setstate__(self, d) -> None: ...

stubs/sympy-stubs/ntheory/continued_fraction.pyi

@@ -10,5 +10,5 @@ from sympy.series.order import Order
 def continued_fraction(a) -> list: ...
 def continued_fraction_periodic(p, q, d=..., s=...) -> list: ...
 def continued_fraction_reduce(cf) -> Order | Basic | Any | Add | Mul: ...
-def continued_fraction_iterator(x) -> Generator[type[UndefinedFunction] | Any, Any, None]: ...
-def continued_fraction_convergents(cf) -> Generator[Any, Any, None]: ...
+def continued_fraction_iterator(x) -> Generator[type[UndefinedFunction] | Any]: ...
+def continued_fraction_convergents(cf) -> Generator[Any]: ...

stubs/sympy-stubs/ntheory/factor_.pyi

@@ -35,17 +35,13 @@ def factorrat(
     rat, limit=..., use_trial=..., use_rho=..., use_pm1=..., verbose=..., visual=..., multiple=...
 ) -> list[Any] | dict[Any, int] | Order: ...
 def primefactors(n, limit=..., verbose=...) -> list[Any]: ...
-def divisors(
-    n, generator=..., proper=...
-) -> list[int] | list[Any] | list[Any | Literal[1]] | Generator[Any | Literal[1], Any, None]: ...
+def divisors(n, generator=..., proper=...) -> list[int] | list[Any] | list[Any | Literal[1]] | Generator[Any | Literal[1]]: ...
 def divisor_count(n, modulus=..., proper=...) -> Order | Literal[0]: ...
-def proper_divisors(
-    n, generator=...
-) -> list[int] | list[Any] | list[Any | Literal[1]] | Generator[Any | Literal[1], Any, None]: ...
+def proper_divisors(n, generator=...) -> list[int] | list[Any] | list[Any | Literal[1]] | Generator[Any | Literal[1]]: ...
 def proper_divisor_count(n, modulus=...) -> Order | Literal[0]: ...
-def udivisors(n, generator=...) -> list[int] | list[Any] | list[Any | Literal[1]] | Generator[Any | Literal[1], Any, None]: ...
+def udivisors(n, generator=...) -> list[int] | list[Any] | list[Any | Literal[1]] | Generator[Any | Literal[1]]: ...
 def udivisor_count(n) -> Any | Literal[0]: ...
-def antidivisors(n, generator=...) -> list[Any] | list[Any | int] | Generator[Any | int, Any, None]: ...
+def antidivisors(n, generator=...) -> list[Any] | list[Any | int] | Generator[Any | int]: ...
 def antidivisor_count(n) -> Literal[0]: ...
 
 class totient(Function):

stubs/sympy-stubs/ntheory/generate.pyi

@@ -10,9 +10,9 @@ class Sieve:
     def __init__(self) -> None: ...
     def extend(self, n) -> None: ...
     def extend_to_no(self, i) -> None: ...
-    def primerange(self, a, b=...) -> Generator[Any, Any, None]: ...
-    def totientrange(self, a, b) -> Generator[int, Any, None]: ...
-    def mobiusrange(self, a, b) -> Generator[int, Any, None]: ...
+    def primerange(self, a, b=...) -> Generator[Any]: ...
+    def totientrange(self, a, b) -> Generator[int]: ...
+    def mobiusrange(self, a, b) -> Generator[int]: ...
     def search(self, n) -> tuple[int, int]: ...
     def __contains__(self, n) -> bool: ...
     def __iter__(self) -> Iterator[array[int] | int]: ...
@@ -28,9 +28,9 @@ class primepi(Function):
 
 def nextprime(n, ith=...) -> int | array[int] | None: ...
 def prevprime(n) -> int | array[int] | None: ...
-def primerange(a, b=...) -> Generator[Any | int | array[int] | None, Any, None]: ...
+def primerange(a, b=...) -> Generator[Any | int | array[int] | None]: ...
 def randprime(a, b) -> int | array[int] | None: ...
 def primorial(n, nth=...) -> array[int] | int: ...
-def cycle_length(f, x0, nmax=..., values=...) -> Generator[Any | tuple[int, None] | tuple[int, int], Any, None]: ...
+def cycle_length(f, x0, nmax=..., values=...) -> Generator[Any | tuple[int, None] | tuple[int, int]]: ...
 def composite(nth) -> int: ...
 def compositepi(n) -> Literal[0]: ...

stubs/sympy-stubs/ntheory/multinomial.pyi

@@ -12,4 +12,4 @@ def multinomial_coefficients(
     | dict[tuple[Any, ...], Any]
     | dict[tuple[int, ...], int]
 ): ...
-def multinomial_coefficients_iterator(m, n, _tuple=...) -> Generator[Any | tuple[tuple[Any, ...], Any], Any, None]: ...
+def multinomial_coefficients_iterator(m, n, _tuple=...) -> Generator[Any | tuple[tuple[Any, ...], Any]]: ...

stubs/sympy-stubs/ntheory/residue_ntheory.pyi

@@ -9,7 +9,7 @@ def n_order(a, n) -> Literal[1]: ...
 def primitive_root(p) -> int | None: ...
 def is_primitive_root(a, p) -> bool: ...
 def sqrt_mod(a, p, all_roots=...) -> list[Any | int] | Any | int | None: ...
-def sqrt_mod_iter(a, p, domain=...) -> Generator[Any | int, Any, None]: ...
+def sqrt_mod_iter(a, p, domain=...) -> Generator[Any | int]: ...
 def is_quad_residue(a, p) -> bool: ...
 def is_nthpow_residue(a, n, m) -> bool: ...
 def nthroot_mod(a, n, p, all_roots=...) -> list[Any | int] | Any | int | list[Any] | list[int] | list[int | Any] | None: ...

stubs/sympy-stubs/plotting/pygletplot/plot_interval.pyi

@@ -30,7 +30,7 @@ class PlotInterval:
     @require_all_args
     def assert_complete(self) -> None: ...
     @require_all_args
-    def vrange(self) -> Generator[Any, Any, None]: ...
+    def vrange(self) -> Generator[Any]: ...
     @require_all_args
-    def vrange2(self) -> Generator[tuple[Any, Any], Any, None]: ...
-    def frange(self) -> Generator[float, Any, None]: ...
+    def vrange2(self) -> Generator[tuple[Any, Any]]: ...
+    def frange(self) -> Generator[float]: ...

stubs/sympy-stubs/plotting/textplot.pyi

@@ -4,5 +4,5 @@ from typing import Any
 def is_valid(x) -> bool: ...
 def rescale(y, W, H, mi, ma) -> list[Any]: ...
 def linspace(start, stop, num) -> list[Any]: ...
-def textplot_str(expr, a, b, W=..., H=...) -> Generator[str, Any, None]: ...
+def textplot_str(expr, a, b, W=..., H=...) -> Generator[str]: ...
 def textplot(expr, a, b, W=..., H=...) -> None: ...

stubs/sympy-stubs/polys/agca/ideals.pyi

@@ -42,7 +42,7 @@ class Ideal(IntegerPowerable):
 class ModuleImplementedIdeal(Ideal):
     def __init__(self, ring, module) -> None: ...
     @property
-    def gens(self) -> Generator[Any, None, None]: ...
+    def gens(self) -> Generator[Any]: ...
     def is_zero(self): ...
     def is_whole_ring(self): ...
     def __repr__(self) -> LiteralString: ...

stubs/sympy-stubs/polys/monomials.pyi

@@ -7,7 +7,7 @@ from sympy.series.order import Order
 from sympy.utilities import public
 
 @public
-def itermonomials(variables, max_degrees, min_degrees=...) -> Generator[Any | Order, Any, None]: ...
+def itermonomials(variables, max_degrees, min_degrees=...) -> Generator[Any | Order]: ...
 def monomial_count(V, N): ...
 def monomial_mul(A, B) -> tuple[Any, ...]: ...
 def monomial_div(A, B) -> tuple[Any, ...] | None: ...

stubs/sympy-stubs/polys/polyconfig.pyi

@@ -6,7 +6,7 @@ _default_config = ...
 _current_config = ...
 
 @contextmanager
-def using(**kwargs) -> Generator[None, Any, None]: ...
+def using(**kwargs) -> Generator[None]: ...
 def setup(key, value=...) -> None: ...
 def query(key): ...
 def configure() -> None: ...

stubs/sympy-stubs/printing/printer.pyi

@@ -4,7 +4,7 @@ from contextlib import contextmanager
 from typing import Any, Callable
 
 @contextmanager
-def printer_context(printer, **kwargs) -> Generator[None, Any, None]: ...
+def printer_context(printer, **kwargs) -> Generator[None]: ...
 
 class Printer:
     _global_settings: dict[str, Any] = ...

stubs/sympy-stubs/series/approximants.pyi

@@ -4,4 +4,4 @@ from typing import Any
 from sympy.utilities import public
 
 @public
-def approximants(l, X=..., simplify=...) -> Generator[Any, Any, None]: ...
+def approximants(l, X=..., simplify=...) -> Generator[Any]: ...

stubs/sympy-stubs/series/formal.pyi

@@ -14,7 +14,7 @@ from sympy.sets.sets import FiniteSet, Interval
 
 def rational_algorithm(f, x, k, order=..., full=...) -> tuple[Any, Any, int] | None: ...
 def rational_independent(terms, x) -> list[Any]: ...
-def simpleDE(f, x, g, order=...) -> Generator[tuple[Any, int], Any, None]: ...
+def simpleDE(f, x, g, order=...) -> Generator[tuple[Any, int]]: ...
 def exp_re(DE, r, k): ...
 def hyper_re(DE, r, k): ...
 def rsolve_hypergeometric(
@@ -71,13 +71,13 @@ class FormalPowerSeries(SeriesBase):
     @property
     def infinite(self): ...
     def polynomial(self, n=...) -> Order: ...
-    def truncate(self, n=...) -> Generator[Any, Any, None]: ...
+    def truncate(self, n=...) -> Generator[Any]: ...
     def zero_coeff(self): ...
     def integrate(self, x=..., **kwargs) -> Equality | Relational | Ne | Self: ...
-    def product(self, other, x=..., n=...) -> Generator[Any, Any, None] | FormalPowerSeriesProduct: ...
+    def product(self, other, x=..., n=...) -> Generator[Any] | FormalPowerSeriesProduct: ...
     def coeff_bell(self, n) -> SeqPer | SeqFormula: ...
-    def compose(self, other, x=..., n=...) -> Generator[Any, Any, None] | FormalPowerSeriesCompose: ...
-    def inverse(self, x=..., n=...) -> Generator[Any, Any, None] | FormalPowerSeriesInverse: ...
+    def compose(self, other, x=..., n=...) -> Generator[Any] | FormalPowerSeriesCompose: ...
+    def inverse(self, x=..., n=...) -> Generator[Any] | FormalPowerSeriesInverse: ...
     def __add__(self, other) -> Self | Order: ...
     def __radd__(self, other) -> Self | Order: ...
     def __neg__(self) -> Self: ...

stubs/sympy-stubs/series/fourier.pyi

@@ -36,7 +36,7 @@ class FourierSeries(SeriesBase):
     def length(self): ...
     @property
     def L(self): ...
-    def truncate(self, n=...) -> Generator[Any, Any, None] | Order: ...
+    def truncate(self, n=...) -> Generator[Any] | Order: ...
     def sigma_approximation(self, n=...) -> Order: ...
     def shift(self, s) -> Self: ...
     def shiftx(self, s) -> Self: ...

stubs/sympy-stubs/solvers/diophantine/diophantine.pyi

@@ -20,7 +20,7 @@ class DiophantineSolutionSet(set):
     def __init__(self, symbols_seq, parameters) -> None: ...
     def add(self, solution) -> None: ...
     def update(self, *solutions) -> None: ...
-    def dict_iterator(self) -> Generator[dict[Any, Any], Any, None]: ...
+    def dict_iterator(self) -> Generator[dict[Any, Any]]: ...
     def subs(self, *args, **kwargs) -> DiophantineSolutionSet: ...
     def __call__(self, *args) -> DiophantineSolutionSet: ...
 
@@ -166,19 +166,19 @@ def holzer(x, y, z, a, b, c) -> tuple[int, ...]: ...
 def diop_general_pythagorean(eq, param=...) -> None: ...
 def diop_general_sum_of_squares(eq, limit=...) -> set[Any] | None: ...
 def diop_general_sum_of_even_powers(eq, limit=...) -> set[Any] | None: ...
-def partition(n, k=..., zeros=...) -> Generator[tuple[Any, ...] | Any, Any, None]: ...
+def partition(n, k=..., zeros=...) -> Generator[tuple[Any, ...] | Any]: ...
 def prime_as_sum_of_two_squares(p) -> tuple[int, int] | None: ...
 def sum_of_three_squares(
     n,
 ) -> tuple[Literal[0], Literal[0], Literal[0]] | tuple[Any, ...] | tuple[Any, Literal[0], Literal[0]] | None: ...
 def sum_of_four_squares(n) -> tuple[Literal[0], Literal[0], Literal[0], Literal[0]] | tuple[Any, ...]: ...
 def power_representation(
     n, p, k, zeros=...
-) -> Generator[tuple[Any, ...] | tuple[Literal[0], ...] | tuple[int] | tuple[Any] | tuple[int, int] | None, Any, None]: ...
+) -> Generator[tuple[Any, ...] | tuple[Literal[0], ...] | tuple[int] | tuple[Any] | tuple[int, int] | None]: ...
 
 sum_of_powers = ...
 
-def pow_rep_recursive(n_i, k, n_remaining, terms, p) -> Generator[tuple[Any, ...] | Any, Any, None]: ...
+def pow_rep_recursive(n_i, k, n_remaining, terms, p) -> Generator[tuple[Any, ...] | Any]: ...
 def sum_of_squares(
     n, k, zeros=...
-) -> Generator[tuple[Any, ...] | tuple[Literal[0], ...] | tuple[int] | tuple[Any] | tuple[int, int] | None, Any, None]: ...
+) -> Generator[tuple[Any, ...] | tuple[Literal[0], ...] | tuple[int] | tuple[Any] | tuple[int, int] | None]: ...