A community-maintained Python framework for creating mathematical animations.
Bump Python target versions of both mypy and ruff
Benjamin Hackl4bc77b3a0049
diff --git a/manim/_config/utils.py b/manim/_config/utils.pyindex 96e154d37..a3da85558 100644--- a/manim/_config/utils.py+++ b/manim/_config/utils.py@@ -33,8 +33,7 @@ from manim.utils.tex import TexTemplateif TYPE_CHECKING:from enum import EnumMeta-- from typing_extensions import Self+ from typing import Selffrom manim.typing import StrPath, Vector3Ddiff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex 5de7605f8..cf0248284 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -17,9 +17,7 @@ __all__ = ["Animation", "Wait", "Add", "override_animation"]from collections.abc import Callable, Iterable, Sequencefrom copy import deepcopyfrom functools import partialmethod-from typing import TYPE_CHECKING, Any--from typing_extensions import Self+from typing import TYPE_CHECKING, Any, Selfif TYPE_CHECKING:from manim.scene.scene import Scene@@ -280,9 +278,12 @@ class Animation:def get_all_families_zipped(self) -> Iterable[tuple]:if config["renderer"] == RendererType.OPENGL:- return zip(*(mob.get_family() for mob in self.get_all_mobjects()))+ return zip(+ *(mob.get_family() for mob in self.get_all_mobjects()), strict=False+ )return zip(- *(mob.family_members_with_points() for mob in self.get_all_mobjects())+ *(mob.family_members_with_points() for mob in self.get_all_mobjects()),+ strict=False,)def update_mobjects(self, dt: float) -> None:diff --git a/manim/animation/changing.py b/manim/animation/changing.pyindex 9b5617f15..194aa364d 100644--- a/manim/animation/changing.py+++ b/manim/animation/changing.py@@ -5,9 +5,7 @@ from __future__ import annotations__all__ = ["AnimatedBoundary", "TracedPath"]from collections.abc import Callable, Sequence-from typing import Any--from typing_extensions import Self+from typing import Any, Selffrom manim.mobject.mobject import Mobjectfrom manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL@@ -99,7 +97,7 @@ class AnimatedBoundary(VGroup):) -> Self:family1 = mob1.family_members_with_points()family2 = mob2.family_members_with_points()- for sm1, sm2 in zip(family1, family2):+ for sm1, sm2 in zip(family1, family2, strict=False):sm1.pointwise_become_partial(sm2, a, b)return selfdiff --git a/manim/animation/composition.py b/manim/animation/composition.pyindex a9da6f890..7f51d04e6 100644--- a/manim/animation/composition.py+++ b/manim/animation/composition.py@@ -185,7 +185,9 @@ class AnimationGroup(Animation):else:sub_alphas[(sub_alphas > 1) | with_zero_run_time] = 1- for anim_to_update, sub_alpha in zip(to_update["anim"], sub_alphas):+ for anim_to_update, sub_alpha in zip(+ to_update["anim"], sub_alphas, strict=False+ ):anim_to_update.interpolate(sub_alpha)self.anim_group_time = anim_group_timediff --git a/manim/animation/creation.py b/manim/animation/creation.pyindex 654100707..0c6d29cb5 100644--- a/manim/animation/creation.py+++ b/manim/animation/creation.py@@ -472,7 +472,7 @@ class SpiralIn(Animation):def interpolate_mobject(self, alpha: float) -> None:alpha = self.rate_func(alpha)- for original_shape, shape in zip(self.shapes, self.mobject):+ for original_shape, shape in zip(self.shapes, self.mobject, strict=False):shape.restore()fill_opacity = original_shape.get_fill_opacity()stroke_opacity = original_shape.get_stroke_opacity()diff --git a/manim/animation/indication.py b/manim/animation/indication.pyindex 600857311..77918e0fb 100644--- a/manim/animation/indication.py+++ b/manim/animation/indication.py@@ -40,10 +40,9 @@ __all__ = []from collections.abc import Iterable-from typing import Any+from typing import Any, Selfimport numpy as np-from typing_extensions import Selffrom manim.mobject.geometry.arc import Circle, Dotfrom manim.mobject.geometry.line import Line@@ -350,6 +349,7 @@ class ShowPassingFlashWithThinningStrokeWidth(AnimationGroup):for stroke_width, time_width in zip(np.linspace(0, max_stroke_width, self.n_segments),np.linspace(max_time_width, 0, self.n_segments),+ strict=False,)),)diff --git a/manim/animation/movement.py b/manim/animation/movement.pyindex c0c79d4ae..c00f45e3c 100644--- a/manim/animation/movement.py+++ b/manim/animation/movement.py@@ -10,7 +10,8 @@ __all__ = ["MoveAlongPath",]-from typing import TYPE_CHECKING, Any, Callable+from collections.abc import Callable+from typing import TYPE_CHECKING, Anyimport numpy as np@@ -18,7 +19,7 @@ from ..animation.animation import Animationfrom ..utils.rate_functions import linearif TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.mobject.types.vectorized_mobject import VMobjectfrom manim.typing import MappingFunction, Point3Ddiff --git a/manim/animation/transform.py b/manim/animation/transform.pyindex 5bf5b7693..e8d1ab319 100644--- a/manim/animation/transform.py+++ b/manim/animation/transform.py@@ -234,8 +234,8 @@ class Transform(Animation):self.target_copy,]if config.renderer == RendererType.OPENGL:- return zip(*(mob.get_family() for mob in mobs))- return zip(*(mob.family_members_with_points() for mob in mobs))+ return zip(*(mob.get_family() for mob in mobs), strict=False)+ return zip(*(mob.family_members_with_points() for mob in mobs), strict=False)def interpolate_submobject(self,@@ -740,7 +740,7 @@ class CyclicReplace(Transform):def create_target(self) -> Group:target = self.group.copy()cycled_targets = [target[-1], *target[:-1]]- for m1, m2 in zip(cycled_targets, self.group):+ for m1, m2 in zip(cycled_targets, self.group, strict=False):m1.move_to(m2)return target@@ -928,5 +928,5 @@ class FadeTransformPieces(FadeTransform):"""Replaces the source submobjects by the target submobjects and setsthe opacity to 0."""- for sm0, sm1 in zip(source.get_family(), target.get_family()):+ for sm0, sm1 in zip(source.get_family(), target.get_family(), strict=False):super().ghost_to(sm0, sm1)diff --git a/manim/camera/camera.py b/manim/camera/camera.pyindex cab8c5ac0..99da24432 100644--- a/manim/camera/camera.py+++ b/manim/camera/camera.py@@ -10,14 +10,13 @@ import operator as opimport pathlibfrom collections.abc import Callable, Iterablefrom functools import reduce-from typing import TYPE_CHECKING, Any+from typing import TYPE_CHECKING, Any, Selfimport cairoimport numpy as npimport numpy.typing as nptfrom PIL import Imagefrom scipy.spatial.distance import pdist-from typing_extensions import Selffrom manim.typing import (FloatRGBA_Array,@@ -759,7 +758,7 @@ class Camera:pat = cairo.LinearGradient(*it.chain(*(point[:2] for point in points)))step = 1.0 / (len(rgbas) - 1)offsets = np.arange(0, 1 + step, step)- for rgba, offset in zip(rgbas, offsets):+ for rgba, offset in zip(rgbas, offsets, strict=False):pat.add_color_stop_rgba(offset, *rgba[2::-1], rgba[3])ctx.set_source(pat)return selfdiff --git a/manim/camera/multi_camera.py b/manim/camera/multi_camera.pyindex f4bd18a47..1ccf11fd1 100644--- a/manim/camera/multi_camera.py+++ b/manim/camera/multi_camera.py@@ -6,9 +6,7 @@ __all__ = ["MultiCamera"]from collections.abc import Iterable-from typing import Any--from typing_extensions import Self+from typing import Any, Selffrom manim.mobject.mobject import Mobjectfrom manim.mobject.types.image_mobject import ImageMobjectFromCameradiff --git a/manim/mobject/geometry/arc.py b/manim/mobject/geometry/arc.pyindex aa3e00800..44485761b 100644--- a/manim/mobject/geometry/arc.py+++ b/manim/mobject/geometry/arc.py@@ -45,10 +45,9 @@ __all__ = [import itertoolsimport warnings-from typing import TYPE_CHECKING, Any, cast+from typing import TYPE_CHECKING, Any, Self, castimport numpy as np-from typing_extensions import Selffrom manim.constants import *from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL@@ -1233,7 +1232,7 @@ class ArcPolygon(VMobject, metaclass=ConvertToOpenGL):arcs = [ArcBetweenPoints(*pair, **conf)- for (pair, conf) in zip(point_pairs, all_arc_configs)+ for (pair, conf) in zip(point_pairs, all_arc_configs, strict=False)]super().__init__(**kwargs)diff --git a/manim/mobject/geometry/line.py b/manim/mobject/geometry/line.pyindex 9b0553d1b..c55fd94f6 100644--- a/manim/mobject/geometry/line.py+++ b/manim/mobject/geometry/line.py@@ -30,7 +30,7 @@ from manim.utils.color import WHITEfrom manim.utils.space_ops import angle_of_vector, line_intersection, normalizeif TYPE_CHECKING:- from typing_extensions import Self, TypeAlias+ from typing import Self, TypeAliasfrom manim.typing import Point3D, Point3DLike, Vector2DLike, Vector3D, Vector3DLikefrom manim.utils.color import ParsableManimColordiff --git a/manim/mobject/geometry/polygram.py b/manim/mobject/geometry/polygram.pyindex 3274d29ff..fa2f21d14 100644--- a/manim/mobject/geometry/polygram.py+++ b/manim/mobject/geometry/polygram.py@@ -32,8 +32,9 @@ from manim.utils.qhull import QuickHullfrom manim.utils.space_ops import angle_between_vectors, normalize, regular_verticesif TYPE_CHECKING:+ from typing import Self+import numpy.typing as npt- from typing_extensions import Selffrom manim.typing import (Point3D,@@ -150,7 +151,9 @@ class Polygram(VMobject, metaclass=ConvertToOpenGL):# TODO: If any of the original vertex groups contained the starting vertex N# times, then .get_vertex_groups() splits it into N vertex groups.group = []- for start, end in zip(self.get_start_anchors(), self.get_end_anchors()):+ for start, end in zip(+ self.get_start_anchors(), self.get_end_anchors(), strict=False+ ):group.append(start)if self.consider_points_equals(end, group[0]):@@ -237,7 +240,7 @@ class Polygram(VMobject, metaclass=ConvertToOpenGL):radius_list = radius * ceil(len(vertex_group) / len(radius))for current_radius, (v1, v2, v3) in zip(- radius_list, adjacent_n_tuples(vertex_group, 3)+ radius_list, adjacent_n_tuples(vertex_group, 3), strict=False):vect1 = v2 - v1vect2 = v3 - v2@@ -549,7 +552,7 @@ class Star(Polygon):)vertices: list[npt.NDArray] = []- for pair in zip(outer_vertices, inner_vertices):+ for pair in zip(outer_vertices, inner_vertices, strict=False):vertices.extend(pair)super().__init__(*vertices, **kwargs)diff --git a/manim/mobject/geometry/shape_matchers.py b/manim/mobject/geometry/shape_matchers.pyindex dd696881f..ae2a70db4 100644--- a/manim/mobject/geometry/shape_matchers.py+++ b/manim/mobject/geometry/shape_matchers.py@@ -4,9 +4,7 @@ from __future__ import annotations__all__ = ["SurroundingRectangle", "BackgroundRectangle", "Cross", "Underline"]-from typing import Any--from typing_extensions import Self+from typing import Any, Selffrom manim import loggerfrom manim._config import configdiff --git a/manim/mobject/graph.py b/manim/mobject/graph.pyindex 55c9d9cba..12710dfea 100644--- a/manim/mobject/graph.py+++ b/manim/mobject/graph.py@@ -16,7 +16,7 @@ import networkx as nximport numpy as npif TYPE_CHECKING:- from typing_extensions import TypeAlias+ from typing import TypeAliasfrom manim.scene.scene import Scenefrom manim.typing import Point3D, Point3DLikediff --git a/manim/mobject/graphing/coordinate_systems.py b/manim/mobject/graphing/coordinate_systems.pyindex 7e6f626ba..48eba6573 100644--- a/manim/mobject/graphing/coordinate_systems.py+++ b/manim/mobject/graphing/coordinate_systems.py@@ -14,10 +14,9 @@ __all__ = [import fractions as frimport numbersfrom collections.abc import Callable, Iterable, Sequence-from typing import TYPE_CHECKING, Any, TypeVar, overload+from typing import TYPE_CHECKING, Any, Self, TypeVar, overloadimport numpy as np-from typing_extensions import Selffrom manim import configfrom manim.constants import *@@ -438,14 +437,20 @@ class CoordinateSystem:if not axes_numbers:axes_numbers = [None for _ in range(self.dimension)]- for axis, values in zip(self.axes, axes_numbers):+ for axis, values in zip(self.axes, axes_numbers, strict=False):if isinstance(values, dict):axis.add_labels(values, **kwargs)labels = axis.labelselif values is None and axis.scaling.custom_labels:tick_range = axis.get_tick_range()axis.add_labels(- dict(zip(tick_range, axis.scaling.get_custom_labels(tick_range)))+ dict(+ zip(+ tick_range,+ axis.scaling.get_custom_labels(tick_range),+ strict=False,+ )+ ))labels = axis.labelselse:@@ -1295,7 +1300,7 @@ class CoordinateSystem:colors = color_gradient(color, len(x_range_array))- for x, color in zip(x_range_array, colors):+ for x, color in zip(x_range_array, colors, strict=False):if input_sample_type == "left":sample_input = xelif input_sample_type == "right":@@ -2031,7 +2036,9 @@ class Axes(VGroup, CoordinateSystem, metaclass=ConvertToOpenGL):))"""- for default_config, passed_config in zip(default_configs, passed_configs):+ for default_config, passed_config in zip(+ default_configs, passed_configs, strict=False+ ):if passed_config is not None:update_dict_recursively(default_config, passed_config)@@ -2161,7 +2168,7 @@ class Axes(VGroup, CoordinateSystem, metaclass=ConvertToOpenGL):# Although "points" and "nums" are in plural, there might be a single point or number.points = self.x_axis.number_to_point(coords[0])other_axes = self.axes.submobjects[1:]- for axis, nums in zip(other_axes, coords[1:]):+ for axis, nums in zip(other_axes, coords[1:], strict=False):points += axis.number_to_point(nums) - origin# Return points as is, except if coords originally looked like@@ -2355,7 +2362,7 @@ class Axes(VGroup, CoordinateSystem, metaclass=ConvertToOpenGL):vertices = [self.coords_to_point(x, y, z)- for x, y, z in zip(x_values, y_values, z_values)+ for x, y, z in zip(x_values, y_values, z_values, strict=False)]graph.set_points_as_corners(vertices)line_graph["line_graph"] = graphdiff --git a/manim/mobject/graphing/functions.py b/manim/mobject/graphing/functions.pyindex 0ce39267a..f344de98d 100644--- a/manim/mobject/graphing/functions.py+++ b/manim/mobject/graphing/functions.py@@ -17,9 +17,7 @@ from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGLfrom manim.mobject.types.vectorized_mobject import VMobjectif TYPE_CHECKING:- from typing import Any-- from typing_extensions import Self+ from typing import Any, Selffrom manim.typing import Point3D, Point3DLikefrom manim.utils.color import ParsableManimColor@@ -159,7 +157,7 @@ class ParametricFunction(VMobject, metaclass=ConvertToOpenGL):else:boundary_times = [self.t_min, self.t_max]- for t1, t2 in zip(boundary_times[0::2], boundary_times[1::2]):+ for t1, t2 in zip(boundary_times[0::2], boundary_times[1::2], strict=False):t_range = np.array([*self.scaling.function(np.arange(t1, t2, self.t_step)),diff --git a/manim/mobject/graphing/number_line.py b/manim/mobject/graphing/number_line.pyindex 66772e74d..1afc2bf5f 100644--- a/manim/mobject/graphing/number_line.py+++ b/manim/mobject/graphing/number_line.py@@ -12,9 +12,7 @@ from collections.abc import Callable, Iterable, Sequencefrom typing import TYPE_CHECKINGif TYPE_CHECKING:- from typing import Any-- from typing_extensions import Self+ from typing import Any, Selffrom manim.mobject.geometry.tips import ArrowTipfrom manim.typing import Point3D, Point3DLike, Vector3D@@ -264,6 +262,7 @@ class NumberLine(Line):zip(tick_range,custom_labels,+ strict=False,)),)diff --git a/manim/mobject/graphing/probability.py b/manim/mobject/graphing/probability.pyindex d31637913..e71a62076 100644--- a/manim/mobject/graphing/probability.py+++ b/manim/mobject/graphing/probability.py@@ -107,7 +107,7 @@ class SampleSpace(Rectangle):last_point = self.get_edge_center(-vect)parts = VGroup()- for factor, color in zip(p_list_complete, colors_in_gradient):+ for factor, color in zip(p_list_complete, colors_in_gradient, strict=False):part = SampleSpace()part.set_fill(color, 1)part.replace(self, stretch=True)@@ -151,7 +151,7 @@ class SampleSpace(Rectangle):) -> VGroup:label_mobs = VGroup()braces = VGroup()- for label, part in zip(labels, parts):+ for label, part in zip(labels, parts, strict=False):brace = Brace(part, direction, min_num_quads=min_num_quads, buff=buff)if isinstance(label, (VMobject, OpenGLVMobject)):label_mob = label@@ -367,7 +367,9 @@ class BarChart(Axes):labels = VGroup()- for i, (value, bar_name) in enumerate(zip(val_range, self.bar_names)):+ for i, (value, bar_name) in enumerate(+ zip(val_range, self.bar_names, strict=False)+ ):# to accommodate negative bars, the label may need to be# below or above the x_axis depending on the value of the bardirection = UP if self.values[i] < 0 else DOWN@@ -463,7 +465,7 @@ class BarChart(Axes):self.add(chart, c_bar_lbls)"""bar_labels = VGroup()- for bar, value in zip(self.bars, self.values):+ for bar, value in zip(self.bars, self.values, strict=False):bar_lbl: MathTex = label_constructor(str(value))if color is None:@@ -511,7 +513,7 @@ class BarChart(Axes):chart.change_bar_values(list(reversed(values)))self.add(chart.get_bar_labels(font_size=24))"""- for i, (bar, value) in enumerate(zip(self.bars, values)):+ for i, (bar, value) in enumerate(zip(self.bars, values, strict=False)):chart_val = self.values[i]if chart_val > 0:diff --git a/manim/mobject/graphing/scale.py b/manim/mobject/graphing/scale.pyindex b6ed2b4ce..4be927b99 100644--- a/manim/mobject/graphing/scale.py+++ b/manim/mobject/graphing/scale.py@@ -11,7 +11,7 @@ __all__ = ["LogBase", "LinearBase"]from manim.mobject.text.numbers import Integerif TYPE_CHECKING:- from typing import Callable+ from collections.abc import Callablefrom manim.mobject.types.vectorized_mobject import VMobjectdiff --git a/manim/mobject/matrix.py b/manim/mobject/matrix.pyindex 36513e4e1..5a965cc65 100644--- a/manim/mobject/matrix.py+++ b/manim/mobject/matrix.py@@ -41,10 +41,9 @@ __all__ = [import itertools as itfrom collections.abc import Callable, Iterable, Sequence-from typing import Any+from typing import Any, Selfimport numpy as np-from typing_extensions import Selffrom manim.mobject.mobject import Mobjectfrom manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL@@ -333,7 +332,7 @@ class Matrix(VMobject, metaclass=ConvertToOpenGL):self.add(m0)"""columns = self.get_columns()- for color, column in zip(colors, columns):+ for color, column in zip(colors, columns, strict=False):column.set_color(color)return self@@ -385,7 +384,7 @@ class Matrix(VMobject, metaclass=ConvertToOpenGL):self.add(m0)"""rows = self.get_rows()- for color, row in zip(colors, rows):+ for color, row in zip(colors, rows, strict=False):row.set_color(color)return selfdiff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.pyindex 57072c99b..4a7c0409e 100644--- a/manim/mobject/mobject.py+++ b/manim/mobject/mobject.py@@ -41,7 +41,7 @@ from ..utils.paths import straight_pathfrom ..utils.space_ops import angle_between_vectors, normalize, rotation_matrixif TYPE_CHECKING:- from typing_extensions import Self, TypeAlias+ from typing import Self, TypeAliasfrom manim.typing import (FunctionOverride,@@ -2016,7 +2016,7 @@ class Mobject:mobs = self.family_members_with_points()new_colors = color_gradient(colors, len(mobs))- for mob, color in zip(mobs, new_colors):+ for mob, color in zip(mobs, new_colors, strict=False):mob.set_color(color, family=False)return self@@ -2309,7 +2309,7 @@ class Mobject:return Group(*(template.copy().pointwise_become_partial(self, a1, a2)- for a1, a2 in zip(alphas[:-1], alphas[1:])+ for a1, a2 in zip(alphas[:-1], alphas[1:], strict=False)))@@ -2502,7 +2502,7 @@ class Mobject:x = VGroup(s1, s2, s3, s4).set_x(0).arrange(buff=1.0)self.add(x)"""- for m1, m2 in zip(self.submobjects, self.submobjects[1:]):+ for m1, m2 in zip(self.submobjects, self.submobjects[1:], strict=False):m2.next_to(m1, direction, buff, **kwargs)if center:self.center()@@ -2887,7 +2887,7 @@ class Mobject:if not skip_point_alignment:self.align_points(mobject)# Recurse- for m1, m2 in zip(self.submobjects, mobject.submobjects):+ for m1, m2 in zip(self.submobjects, mobject.submobjects, strict=False):m1.align_data(m2)def get_point_mobject(self, center=None):@@ -2957,7 +2957,7 @@ class Mobject:repeat_indices = (np.arange(target) * curr) // targetsplit_factors = [sum(repeat_indices == i) for i in range(curr)]new_submobs = []- for submob, sf in zip(self.submobjects, split_factors):+ for submob, sf in zip(self.submobjects, split_factors, strict=False):new_submobs.append(submob)new_submobs.extend(submob.copy().fade(1) for _ in range(1, sf))self.submobjects = new_submobs@@ -3169,7 +3169,7 @@ class Mobject:mobject.move_to(self.get_center())self.align_data(mobject, skip_point_alignment=True)- for sm1, sm2 in zip(self.get_family(), mobject.get_family()):+ for sm1, sm2 in zip(self.get_family(), mobject.get_family(), strict=False):sm1.points = np.array(sm2.points)sm1.interpolate_color(sm1, sm2, 1)return self@@ -3191,7 +3191,7 @@ class Mobject:self.play(circ.animate.match_points(square))self.wait(0.5)"""- for sm1, sm2 in zip(self.get_family(), mobject.get_family()):+ for sm1, sm2 in zip(self.get_family(), mobject.get_family(), strict=False):sm1.points = np.array(sm2.points)return selfdiff --git a/manim/mobject/opengl/dot_cloud.py b/manim/mobject/opengl/dot_cloud.pyindex 7161c4637..5154bc71a 100644--- a/manim/mobject/opengl/dot_cloud.py+++ b/manim/mobject/opengl/dot_cloud.py@@ -2,10 +2,9 @@ from __future__ import annotations__all__ = ["TrueDot", "DotCloud"]-from typing import Any+from typing import Any, Selfimport numpy as np-from typing_extensions import Selffrom manim.constants import ORIGIN, RIGHT, UPfrom manim.mobject.opengl.opengl_point_cloud_mobject import OpenGLPMobjectdiff --git a/manim/mobject/opengl/opengl_geometry.py b/manim/mobject/opengl/opengl_geometry.pyindex 79fd0581c..24c035fea 100644--- a/manim/mobject/opengl/opengl_geometry.py+++ b/manim/mobject/opengl/opengl_geometry.py@@ -1,9 +1,8 @@from __future__ import annotations-from typing import Any, cast+from typing import Any, Self, castimport numpy as np-from typing_extensions import Selffrom manim.constants import *from manim.mobject.mobject import Mobjectdiff --git a/manim/mobject/opengl/opengl_mobject.py b/manim/mobject/opengl/opengl_mobject.pyindex e071fdb48..7c0657c6f 100644--- a/manim/mobject/opengl/opengl_mobject.py+++ b/manim/mobject/opengl/opengl_mobject.py@@ -9,16 +9,23 @@ import typesfrom collections.abc import Callable, Iterable, Iterator, Sequencefrom functools import partialmethod, wrapsfrom math import ceil-from typing import TYPE_CHECKING, Any, ClassVar, Protocol, TypeVar, cast+from typing import (+ TYPE_CHECKING,+ Any,+ ClassVar,+ Never,+ Protocol,+ Self,+ TypeAlias,+ TypeVar,+ cast,+ overload,+)import modernglimport numpy as npimport numpy.typing as nptfrom typing_extensions import (- Never,- Self,- TypeAlias,- overload,override,)@@ -1048,7 +1055,7 @@ class OpenGLMobject:x = OpenGLVGroup(s1, s2, s3, s4).set_x(0).arrange(buff=1.0)self.add(x)"""- for m1, m2 in zip(self.submobjects, self.submobjects[1:]):+ for m1, m2 in zip(self.submobjects, self.submobjects[1:], strict=False):m2.next_to(m1, direction, **kwargs)if center:self.center()@@ -2183,7 +2190,7 @@ class OpenGLMobject:# Color and opacityif color is not None and opacity is not None:rgbas: FloatRGBA_Array = np.array(- [[*rgb, o] for rgb, o in zip(*make_even(rgbs, opacities))]+ [[*rgb, o] for rgb, o in zip(*make_even(rgbs, opacities), strict=False)])for mob in self.get_family(recurse):mob.data[name] = rgbas.copy()@@ -2259,7 +2266,7 @@ class OpenGLMobject:mobs = self.submobjectsnew_colors = color_gradient(colors, len(mobs))- for mob, color in zip(mobs, new_colors):+ for mob, color in zip(mobs, new_colors, strict=False):mob.set_color(color)return self@@ -2474,7 +2481,7 @@ class OpenGLMobject:return OpenGLGroup(*(template.copy().pointwise_become_partial(self, a1, a2)- for a1, a2 in zip(alphas[:-1], alphas[1:])+ for a1, a2 in zip(alphas[:-1], alphas[1:], strict=False)))@@ -2575,7 +2582,7 @@ class OpenGLMobject:def align_data(self, mobject: OpenGLMobject) -> Self:# In case any data arrays get resized when aligned to shader data# self.refresh_shader_data()- for mob1, mob2 in zip(self.get_family(), mobject.get_family()):+ for mob1, mob2 in zip(self.get_family(), mobject.get_family(), strict=False):# Separate out how points are treated so that subclasses# can handle that case differently if they choosemob1.align_points(mob2)@@ -2605,7 +2612,7 @@ class OpenGLMobject:mob1.add_n_more_submobjects(max(0, n2 - n1))mob2.add_n_more_submobjects(max(0, n1 - n2))# Recurse- for sm1, sm2 in zip(mob1.submobjects, mob2.submobjects):+ for sm1, sm2 in zip(mob1.submobjects, mob2.submobjects, strict=False):sm1.align_family(sm2)return self@@ -2631,7 +2638,7 @@ class OpenGLMobject:repeat_indices = (np.arange(target) * curr) // targetsplit_factors = [(repeat_indices == i).sum() for i in range(curr)]new_submobs = []- for submob, sf in zip(self.submobjects, split_factors):+ for submob, sf in zip(self.submobjects, split_factors, strict=False):new_submobs.append(submob)for _ in range(1, sf):new_submob = submob.copy()@@ -2773,7 +2780,7 @@ class OpenGLMobject:mobject.move_to(self.get_center())self.align_family(mobject)- for sm1, sm2 in zip(self.get_family(), mobject.get_family()):+ for sm1, sm2 in zip(self.get_family(), mobject.get_family(), strict=False):sm1.set_data(sm2.data)sm1.set_uniforms(sm2.uniforms)self.refresh_bounding_box(recurse_down=True)@@ -2802,6 +2809,7 @@ class OpenGLMobject:self.get_family(),mobject1.get_family(),mobject2.get_family(),+ strict=False,):keys = sm.data.keys() & sm1.data.keys() & sm2.data.keys()sm.lock_data(diff --git a/manim/mobject/opengl/opengl_point_cloud_mobject.py b/manim/mobject/opengl/opengl_point_cloud_mobject.pyindex ecdfc3946..957185372 100644--- a/manim/mobject/opengl/opengl_point_cloud_mobject.py+++ b/manim/mobject/opengl/opengl_point_cloud_mobject.py@@ -22,7 +22,7 @@ from manim.utils.config_ops import _Uniformsfrom manim.utils.iterables import resize_with_interpolationif TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.typing import (FloatRGBA_Array,diff --git a/manim/mobject/opengl/opengl_vectorized_mobject.py b/manim/mobject/opengl/opengl_vectorized_mobject.pyindex c3889e99f..f7446bad5 100644--- a/manim/mobject/opengl/opengl_vectorized_mobject.py+++ b/manim/mobject/opengl/opengl_vectorized_mobject.py@@ -4,11 +4,10 @@ import itertools as itimport operator as opfrom collections.abc import Callable, Iterable, Sequencefrom functools import reduce, wraps-from typing import Any+from typing import Any, Selfimport modernglimport numpy as np-from typing_extensions import Selffrom manim import configfrom manim.constants import *@@ -351,7 +350,7 @@ class OpenGLVMobject(OpenGLMobject):return selfelif len(submobs2) == 0:submobs2 = [vmobject]- for sm1, sm2 in zip(*make_even(submobs1, submobs2)):+ for sm1, sm2 in zip(*make_even(submobs1, submobs2), strict=False):sm1.match_style(sm2)return self@@ -581,7 +580,7 @@ class OpenGLVMobject(OpenGLMobject):new_points.extend([partial_bezier_points(tup, a1, a2)- for a1, a2 in zip(alphas, alphas[1:])+ for a1, a2 in zip(alphas, alphas[1:], strict=False)],)else:@@ -770,7 +769,7 @@ class OpenGLVMobject(OpenGLMobject):split_indices = [0, *split_indices, len(points)]return [points[i1:i2]- for i1, i2 in zip(split_indices, split_indices[1:])+ for i1, i2 in zip(split_indices, split_indices[1:], strict=False)if (i2 - i1) >= nppc]@@ -1094,7 +1093,7 @@ class OpenGLVMobject(OpenGLMobject):s = self.get_start_anchors()e = self.get_end_anchors()- return list(it.chain.from_iterable(zip(s, e)))+ return list(it.chain.from_iterable(zip(s, e, strict=False)))def get_points_without_null_curves(self, atol=1e-9):nppc = self.n_points_per_curvediff --git a/manim/mobject/svg/brace.py b/manim/mobject/svg/brace.pyindex ea969e071..af6989c91 100644--- a/manim/mobject/svg/brace.py+++ b/manim/mobject/svg/brace.py@@ -4,11 +4,10 @@ from __future__ import annotations__all__ = ["Brace", "BraceLabel", "ArcBrace", "BraceText", "BraceBetweenPoints"]-from typing import TYPE_CHECKING, Any+from typing import TYPE_CHECKING, Any, Selfimport numpy as npimport svgelements as se-from typing_extensions import Selffrom manim._config import configfrom manim.mobject.geometry.arc import Arcdiff --git a/manim/mobject/table.py b/manim/mobject/table.pyindex 432fa1a42..6aa806277 100644--- a/manim/mobject/table.py+++ b/manim/mobject/table.py@@ -526,7 +526,7 @@ class Table(VGroup):self.add(table)"""columns = self.get_columns()- for color, column in zip(colors, columns):+ for color, column in zip(colors, columns, strict=False):column.set_color(color)return self@@ -555,7 +555,7 @@ class Table(VGroup):self.add(table)"""rows = self.get_rows()- for color, row in zip(colors, rows):+ for color, row in zip(colors, rows, strict=False):row.set_color(color)return selfdiff --git a/manim/mobject/text/code_mobject.py b/manim/mobject/text/code_mobject.pyindex 0f86b20ed..efa82cde8 100644--- a/manim/mobject/text/code_mobject.py+++ b/manim/mobject/text/code_mobject.py@@ -207,7 +207,7 @@ class Code(VMobject, metaclass=ConvertToOpenGL):*code_lines,**base_paragraph_config,)- for line, color_range in zip(self.code_lines, color_ranges):+ for line, color_range in zip(self.code_lines, color_ranges, strict=False):for start, end, color in color_range:line[start:end].set_color(color)diff --git a/manim/mobject/text/numbers.py b/manim/mobject/text/numbers.pyindex 2d8c509dc..cd2372c54 100644--- a/manim/mobject/text/numbers.py+++ b/manim/mobject/text/numbers.py@@ -4,10 +4,9 @@ from __future__ import annotations__all__ = ["DecimalNumber", "Integer", "Variable"]-from typing import Any+from typing import Any, Selfimport numpy as np-from typing_extensions import Selffrom manim import configfrom manim.constants import *@@ -295,7 +294,7 @@ class DecimalNumber(VMobject, metaclass=ConvertToOpenGL):self._set_submobjects_from_number(number)self.font_size = old_font_sizeself.move_to(move_to_point, self.edge_to_fix)- for sm1, sm2 in zip(self.submobjects, old_submobjects):+ for sm1, sm2 in zip(self.submobjects, old_submobjects, strict=False):sm1.match_style(sm2)if config.renderer == RendererType.CAIRO:diff --git a/manim/mobject/text/tex_mobject.py b/manim/mobject/text/tex_mobject.pyindex 03bc285e7..5d5cca069 100644--- a/manim/mobject/text/tex_mobject.py+++ b/manim/mobject/text/tex_mobject.py@@ -29,9 +29,7 @@ import refrom collections.abc import Iterable, Sequencefrom functools import reducefrom textwrap import dedent-from typing import Any--from typing_extensions import Self+from typing import Any, Selffrom manim import config, loggerfrom manim.constants import *diff --git a/manim/mobject/text/text_mobject.py b/manim/mobject/text/text_mobject.pyindex 18518ea3f..d4a7ae42f 100644--- a/manim/mobject/text/text_mobject.py+++ b/manim/mobject/text/text_mobject.py@@ -76,7 +76,7 @@ from manim.typing import Point3Dfrom manim.utils.color import ManimColor, ParsableManimColor, color_gradientif TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.typing import Point3Ddiff --git a/manim/mobject/three_d/polyhedra.py b/manim/mobject/three_d/polyhedra.pyindex 472f548d6..4d86b88a9 100644--- a/manim/mobject/three_d/polyhedra.py+++ b/manim/mobject/three_d/polyhedra.py@@ -132,7 +132,7 @@ class Polyhedron(VGroup):"""Creates list of cyclic pairwise tuples."""edges: list[tuple[int, int]] = []for face in faces_list:- edges += zip(face, face[1:] + face[:1])+ edges += zip(face, face[1:] + face[:1], strict=False)return edgesdef create_faces(diff --git a/manim/mobject/three_d/three_dimensions.py b/manim/mobject/three_d/three_dimensions.pyindex 53d8e98c8..c630c6464 100644--- a/manim/mobject/three_d/three_dimensions.py+++ b/manim/mobject/three_d/three_dimensions.py@@ -17,10 +17,9 @@ __all__ = []from collections.abc import Callable, Iterable, Sequence-from typing import TYPE_CHECKING, Any, Literal+from typing import TYPE_CHECKING, Any, Literal, Selfimport numpy as np-from typing_extensions import Selffrom manim import config, loggerfrom manim.constants import *diff --git a/manim/mobject/types/image_mobject.py b/manim/mobject/types/image_mobject.pyindex d2cb1a3f0..dda566cfc 100644--- a/manim/mobject/types/image_mobject.py+++ b/manim/mobject/types/image_mobject.py@@ -24,8 +24,9 @@ from ...utils.images import change_to_rgba_array, get_full_raster_image_path__all__ = ["ImageMobject", "ImageMobjectFromCamera"]if TYPE_CHECKING:+ from typing import Self+import numpy.typing as npt- from typing_extensions import Selffrom manim.typing import PixelArray, StrPathdiff --git a/manim/mobject/types/point_cloud_mobject.py b/manim/mobject/types/point_cloud_mobject.pyindex dcef684df..6b315fba9 100644--- a/manim/mobject/types/point_cloud_mobject.py+++ b/manim/mobject/types/point_cloud_mobject.py@@ -30,8 +30,9 @@ from ...utils.iterables import stretch_array_to_length__all__ = ["PMobject", "Mobject1D", "Mobject2D", "PGroup", "PointCloudDot", "Point"]if TYPE_CHECKING:+ from typing import Self+import numpy.typing as npt- from typing_extensions import Selffrom manim.typing import (FloatRGBA_Array,@@ -198,7 +199,7 @@ class PMobject(Mobject, metaclass=ConvertToOpenGL):def ingest_submobjects(self) -> Self:attrs = self.get_array_attrs()arrays = list(map(self.get_merged_array, attrs))- for attr, array in zip(attrs, arrays):+ for attr, array in zip(attrs, arrays, strict=False):setattr(self, attr, array)self.submobjects = []return selfdiff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.pyindex b5a51811a..4856477e4 100644--- a/manim/mobject/types/vectorized_mobject.py+++ b/manim/mobject/types/vectorized_mobject.py@@ -47,8 +47,9 @@ from manim.utils.iterables import (from manim.utils.space_ops import rotate_vector, shoelace_directionif TYPE_CHECKING:+ from typing import Self+import numpy.typing as npt- from typing_extensions import Selffrom manim.typing import (CubicBezierPath,@@ -233,7 +234,10 @@ class VMobject(Mobject):o if (o is not None) else 0.0 for o in tuplify(opacity)]rgbas: FloatRGBA_Array = np.array(- [c.to_rgba_with_alpha(o) for c, o in zip(*make_even(colors, opacities))],+ [+ c.to_rgba_with_alpha(o)+ for c, o in zip(*make_even(colors, opacities), strict=False)+ ],)sheen_factor = self.get_sheen_factor()@@ -457,7 +461,7 @@ class VMobject(Mobject):return selfelif len(submobs2) == 0:submobs2 = [vmobject]- for sm1, sm2 in zip(*make_even(submobs1, submobs2)):+ for sm1, sm2 in zip(*make_even(submobs1, submobs2), strict=False):sm1.match_style(sm2)return self@@ -1333,7 +1337,7 @@ class VMobject(Mobject):split_indices = [0] + list(filtered) + [len(points)]return (points[i1:i2]- for i1, i2 in zip(split_indices, split_indices[1:])+ for i1, i2 in zip(split_indices, split_indices[1:], strict=False)if (i2 - i1) >= nppcc)@@ -1687,7 +1691,7 @@ class VMobject(Mobject):s = self.get_start_anchors()e = self.get_end_anchors()- return list(it.chain.from_iterable(zip(s, e)))+ return list(it.chain.from_iterable(zip(s, e, strict=False)))def get_points_defining_boundary(self) -> Point3D_Array:# Probably returns all anchors, but this is weird regarding the name of the method.diff --git a/manim/mobject/value_tracker.py b/manim/mobject/value_tracker.pyindex a3648cd5a..947a3c001 100644--- a/manim/mobject/value_tracker.py+++ b/manim/mobject/value_tracker.py@@ -13,7 +13,7 @@ from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGLfrom manim.utils.paths import straight_pathif TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.typing import PathFuncTypediff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.pyindex 15fc6e885..7284504cd 100644--- a/manim/renderer/opengl_renderer.py+++ b/manim/renderer/opengl_renderer.py@@ -40,7 +40,7 @@ from .vectorized_mobject_rendering import ()if TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.animation.animation import Animationfrom manim.mobject.mobject import Mobjectdiff --git a/manim/renderer/shader.py b/manim/renderer/shader.pyindex 0cdf62a2d..64f7a0093 100644--- a/manim/renderer/shader.py+++ b/manim/renderer/shader.py@@ -6,12 +6,11 @@ import reimport textwrapfrom collections.abc import Callable, Iterator, Sequencefrom pathlib import Path-from typing import TYPE_CHECKING, Any+from typing import TYPE_CHECKING, Any, Self, TypeAliasimport modernglimport numpy as npimport numpy.typing as npt-from typing_extensions import Self, TypeAliasif TYPE_CHECKING:from manim.renderer.opengl_renderer import OpenGLRendererdiff --git a/manim/renderer/shader_wrapper.py b/manim/renderer/shader_wrapper.pyindex f7c8d8f4e..d35953a62 100644--- a/manim/renderer/shader_wrapper.py+++ b/manim/renderer/shader_wrapper.py@@ -5,12 +5,11 @@ import loggingimport refrom collections.abc import Mapping, Sequencefrom pathlib import Path-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Self, TypeAliasimport modernglimport numpy as npimport numpy.typing as npt-from typing_extensions import Self, TypeAliasif TYPE_CHECKING:from manim.typing import FloatRGBLike_Arraydiff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex 73faf6003..2a12f048d 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -33,7 +33,7 @@ except ImportError:dearpygui_imported = Falsefrom collections.abc import Callable, Iterable, Sequence-from typing import TYPE_CHECKING, Any, Union+from typing import TYPE_CHECKING, Anyimport numpy as npfrom tqdm import tqdm@@ -62,14 +62,13 @@ from ..utils.module_ops import scene_classes_from_fileif TYPE_CHECKING:from types import FrameType-- from typing_extensions import Self, TypeAlias+ from typing import Self, TypeAliasfrom manim.typing import Point3D- SceneInteractAction: TypeAlias = Union[- MethodWithArgs, "SceneInteractContinue", "SceneInteractRerun"- ]+ SceneInteractAction: TypeAlias = (+ MethodWithArgs | "SceneInteractContinue" | "SceneInteractRerun"+ )"""The SceneInteractAction type alias is used for elements in the queueused by :meth:`.Scene.interact()`.diff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.pyindex 7e0748126..17178e40a 100644--- a/manim/scene/vector_space_scene.py+++ b/manim/scene/vector_space_scene.py@@ -45,7 +45,7 @@ from ..utils.rate_functions import rush_from, rush_intofrom ..utils.space_ops import angle_of_vectorif TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.typing import (MappingFunction,@@ -682,7 +682,9 @@ class LinearTransformationScene(VectorScene):default_configs: Iterable[dict[str, Any]],passed_configs: Iterable[dict[str, Any] | None],) -> None:- for default_config, passed_config in zip(default_configs, passed_configs):+ for default_config, passed_config in zip(+ default_configs, passed_configs, strict=False+ ):if passed_config is not None:update_dict_recursively(default_config, passed_config)diff --git a/manim/typing.py b/manim/typing.pyindex 0caf19c94..70b361502 100644--- a/manim/typing.py+++ b/manim/typing.py@@ -22,11 +22,10 @@ from __future__ import annotationsfrom collections.abc import Callable, Sequencefrom os import PathLike-from typing import Union+from typing import TypeAliasimport numpy as npimport numpy.typing as npt-from typing_extensions import TypeAlias__all__ = ["ManimFloat",@@ -157,7 +156,7 @@ Its components describe, in order, the intensity of Red, Green, andBlue in the represented color."""-FloatRGBLike: TypeAlias = Union[FloatRGB, tuple[float, float, float]]+FloatRGBLike: TypeAlias = FloatRGB | tuple[float, float, float]"""``shape: (3,)``An array of 3 floats between 0 and 1, representing a color in RGB@@ -173,7 +172,7 @@ FloatRGB_Array: TypeAlias = npt.NDArray[ManimColorDType]A :class:`numpy.ndarray` of many rows of 3 floats representing RGB colors."""-FloatRGBLike_Array: TypeAlias = Union[FloatRGB_Array, Sequence[FloatRGBLike]]+FloatRGBLike_Array: TypeAlias = FloatRGB_Array | Sequence[FloatRGBLike]"""``shape: (M, 3)``An array of many rows of 3 floats representing RGB colors.@@ -192,7 +191,7 @@ Its components describe, in order, the intensity of Red, Green, andBlue in the represented color."""-IntRGBLike: TypeAlias = Union[IntRGB, tuple[int, int, int]]+IntRGBLike: TypeAlias = IntRGB | tuple[int, int, int]"""``shape: (3,)``An array of 3 integers between 0 and 255, representing a color in RGB@@ -212,7 +211,7 @@ Its components describe, in order, the intensity of Red, Green, Blueand Alpha (opacity) in the represented color."""-FloatRGBALike: TypeAlias = Union[FloatRGBA, tuple[float, float, float, float]]+FloatRGBALike: TypeAlias = FloatRGBA | tuple[float, float, float, float]"""``shape: (4,)``An array of 4 floats between 0 and 1, representing a color in RGBA@@ -228,7 +227,7 @@ FloatRGBA_Array: TypeAlias = npt.NDArray[ManimColorDType]A :class:`numpy.ndarray` of many rows of 4 floats representing RGBA colors."""-FloatRGBALike_Array: TypeAlias = Union[FloatRGBA_Array, Sequence[FloatRGBALike]]+FloatRGBALike_Array: TypeAlias = FloatRGBA_Array | Sequence[FloatRGBALike]"""``shape: (M, 4)``An array of many rows of 4 floats representing RGBA colors.@@ -247,7 +246,7 @@ Its components describe, in order, the intensity of Red, Green, Blueand Alpha (opacity) in the represented color."""-IntRGBALike: TypeAlias = Union[IntRGBA, tuple[int, int, int, int]]+IntRGBALike: TypeAlias = IntRGBA | tuple[int, int, int, int]"""``shape: (4,)``An array of 4 integers between 0 and 255, representing a color in RGBA@@ -344,7 +343,7 @@ Point2D: TypeAlias = npt.NDArray[PointDType]A NumPy array representing a 2-dimensional point: ``[float, float]``."""-Point2DLike: TypeAlias = Union[Point2D, tuple[float, float]]+Point2DLike: TypeAlias = Point2D | tuple[float, float]"""``shape: (2,)``A 2-dimensional point: ``[float, float]``.@@ -360,7 +359,7 @@ A NumPy array representing a sequence of :class:`.Point2D` objects:``[[float, float], ...]``."""-Point2DLike_Array: TypeAlias = Union[Point2D_Array, Sequence[Point2DLike]]+Point2DLike_Array: TypeAlias = Point2D_Array | Sequence[Point2DLike]"""``shape: (M, 2)``An array of :class:`.Point2DLike` objects: ``[[float, float], ...]``.@@ -378,7 +377,7 @@ Point3D: TypeAlias = npt.NDArray[PointDType]A NumPy array representing a 3-dimensional point: ``[float, float, float]``."""-Point3DLike: TypeAlias = Union[Point3D, tuple[float, float, float]]+Point3DLike: TypeAlias = Point3D | tuple[float, float, float]"""``shape: (3,)``A 3-dimensional point: ``[float, float, float]``.@@ -394,7 +393,7 @@ A NumPy array representing a sequence of :class:`.Point3D` objects:``[[float, float, float], ...]``."""-Point3DLike_Array: TypeAlias = Union[Point3D_Array, Sequence[Point3DLike]]+Point3DLike_Array: TypeAlias = Point3D_Array | Sequence[Point3DLike]"""``shape: (M, 3)``An array of :class:`.Point3DLike` objects: ``[[float, float, float], ...]``.@@ -412,7 +411,7 @@ PointND: TypeAlias = npt.NDArray[PointDType]A NumPy array representing an N-dimensional point: ``[float, ...]``."""-PointNDLike: TypeAlias = Union[PointND, Sequence[float]]+PointNDLike: TypeAlias = PointND | Sequence[float]"""``shape: (N,)``An N-dimensional point: ``[float, ...]``.@@ -428,7 +427,7 @@ A NumPy array representing a sequence of :class:`.PointND` objects:``[[float, ...], ...]``."""-PointNDLike_Array: TypeAlias = Union[PointND_Array, Sequence[PointNDLike]]+PointNDLike_Array: TypeAlias = PointND_Array | Sequence[PointNDLike]"""``shape: (M, N)``An array of :class:`.PointNDLike` objects: ``[[float, ...], ...]``.@@ -456,7 +455,7 @@ A NumPy array representing a 2-dimensional vector: ``[float, float]``.VMobjects!"""-Vector2DLike: TypeAlias = Union[npt.NDArray[PointDType], tuple[float, float]]+Vector2DLike: TypeAlias = npt.NDArray[PointDType] | tuple[float, float]"""``shape: (2,)``A 2-dimensional vector: ``[float, float]``.@@ -476,7 +475,7 @@ A NumPy array representing a sequence of :class:`.Vector2D` objects:``[[float, float], ...]``."""-Vector2DLike_Array: TypeAlias = Union[Vector2D_Array, Sequence[Vector2DLike]]+Vector2DLike_Array: TypeAlias = Vector2D_Array | Sequence[Vector2DLike]"""``shape: (M, 2)``An array of :class:`.Vector2DLike` objects: ``[[float, float], ...]``.@@ -495,7 +494,7 @@ A NumPy array representing a 3-dimensional vector: ``[float, float, float]``.VMobjects!"""-Vector3DLike: TypeAlias = Union[npt.NDArray[PointDType], tuple[float, float, float]]+Vector3DLike: TypeAlias = npt.NDArray[PointDType] | tuple[float, float, float]"""``shape: (3,)``A 3-dimensional vector: ``[float, float, float]``.@@ -515,7 +514,7 @@ An NumPy array representing a sequence of :class:`.Vector3D` objects:``[[float, float, float], ...]``."""-Vector3DLike_Array: TypeAlias = Union[npt.NDArray[PointDType], Sequence[Vector3DLike]]+Vector3DLike_Array: TypeAlias = npt.NDArray[PointDType] | Sequence[Vector3DLike]"""``shape: (M, 3)``An array of :class:`.Vector3DLike` objects: ``[[float, float, float], ...]``.@@ -535,7 +534,7 @@ A NumPy array representing an :math:`N`-dimensional vector: ``[float, ...]``.collisions."""-VectorNDLike: TypeAlias = Union[npt.NDArray[PointDType], Sequence[float]]+VectorNDLike: TypeAlias = npt.NDArray[PointDType] | Sequence[float]"""``shape (N,)``An :math:`N`-dimensional vector: ``[float, ...]``.@@ -556,7 +555,7 @@ A NumPy array representing a sequence of :class:`.VectorND` objects:``[[float, ...], ...]``."""-VectorNDLike_Array: TypeAlias = Union[npt.NDArray[PointDType], Sequence[VectorNDLike]]+VectorNDLike_Array: TypeAlias = npt.NDArray[PointDType] | Sequence[VectorNDLike]"""``shape (M, N)``An array of :class:`.VectorNDLike` objects: ``[[float, ...], ...]``.@@ -610,9 +609,9 @@ curve:``[[float, float, float], [float, float, float], [float, float, float]]``."""-QuadraticBezierPointsLike: TypeAlias = Union[- QuadraticBezierPoints, tuple[Point3DLike, Point3DLike, Point3DLike]-]+QuadraticBezierPointsLike: TypeAlias = (+ QuadraticBezierPoints | tuple[Point3DLike, Point3DLike, Point3DLike]+)"""``shape: (3, 3)``A :class:`.Point3DLike_Array` of three 3D control points for a single quadratic Bézier@@ -630,9 +629,9 @@ A NumPy array containing :math:`N` :class:`.QuadraticBezierPoints` objects:``[[[float, float, float], [float, float, float], [float, float, float]], ...]``."""-QuadraticBezierPointsLike_Array: TypeAlias = Union[- QuadraticBezierPoints_Array, Sequence[QuadraticBezierPointsLike]-]+QuadraticBezierPointsLike_Array: TypeAlias = (+ QuadraticBezierPoints_Array | Sequence[QuadraticBezierPointsLike]+)"""``shape: (N, 3, 3)``A sequence of :math:`N` :class:`.QuadraticBezierPointsLike` objects:@@ -701,9 +700,9 @@ A :class:`.Point3D_Array` of four 3D control points for a single cubic Bézier c``[[float, float, float], [float, float, float], [float, float, float], [float, float, float]]``."""-CubicBezierPointsLike: TypeAlias = Union[- CubicBezierPoints, tuple[Point3DLike, Point3DLike, Point3DLike, Point3DLike]-]+CubicBezierPointsLike: TypeAlias = (+ CubicBezierPoints | tuple[Point3DLike, Point3DLike, Point3DLike, Point3DLike]+)"""``shape: (4, 3)``A :class:`.Point3DLike_Array` of 4 control points for a single cubic Bézier curve:@@ -720,9 +719,9 @@ A NumPy array containing :math:`N` :class:`.CubicBezierPoints` objects:``[[[float, float, float], [float, float, float], [float, float, float], [float, float, float]], ...]``."""-CubicBezierPointsLike_Array: TypeAlias = Union[- CubicBezierPoints_Array, Sequence[CubicBezierPointsLike]-]+CubicBezierPointsLike_Array: TypeAlias = (+ CubicBezierPoints_Array | Sequence[CubicBezierPointsLike]+)"""``shape: (N, 4, 3)``A sequence of :math:`N` :class:`.CubicBezierPointsLike` objects:@@ -823,9 +822,7 @@ Please refer to the documentation of the function you are using forfurther type information."""-BezierPointsLike_Array: TypeAlias = Union[- BezierPoints_Array, Sequence[BezierPointsLike]-]+BezierPointsLike_Array: TypeAlias = BezierPoints_Array | Sequence[BezierPointsLike]r"""``shape: (N, PPC, 3)``A sequence of :math:`N` :class:`.BezierPointsLike` objects containing@@ -898,7 +895,7 @@ Please refer to the documentation of the function you are using forfurther type information."""-FlatBezierPoints: TypeAlias = Union[npt.NDArray[PointDType], tuple[float, ...]]+FlatBezierPoints: TypeAlias = npt.NDArray[PointDType] | tuple[float, ...]"""``shape: (3*PPC*N,)``A flattened array of Bézier control points:@@ -979,12 +976,12 @@ value is an :class:`.RGBA_Array_Int` object.Path types"""-StrPath: TypeAlias = Union[str, PathLike[str]]+StrPath: TypeAlias = str | PathLike[str]"""A string or :class:`.os.PathLike` representing a path to adirectory or file."""-StrOrBytesPath: TypeAlias = Union[str, bytes, PathLike[str], PathLike[bytes]]+StrOrBytesPath: TypeAlias = str | bytes | PathLike[str] | PathLike[bytes]"""A string, bytes or :class:`.os.PathLike` object representing a pathto a directory or file."""diff --git a/manim/utils/bezier.py b/manim/utils/bezier.pyindex 3dc696814..2af303b4a 100644--- a/manim/utils/bezier.py+++ b/manim/utils/bezier.py@@ -999,7 +999,7 @@ def bezier_remap(new_tuples = np.empty((new_number_of_curves, nppc, dim))index = 0- for curve, sf in zip(bezier_tuples, split_factors):+ for curve, sf in zip(bezier_tuples, split_factors, strict=False):new_tuples[index : index + sf] = subdivide_bezier(curve, sf).reshape(sf, nppc, dim)diff --git a/manim/utils/color/core.py b/manim/utils/color/core.pyindex 984399ffb..a3831f5d8 100644--- a/manim/utils/color/core.py+++ b/manim/utils/color/core.py@@ -70,11 +70,11 @@ import colorsysimport randomimport refrom collections.abc import Iterable, Sequence-from typing import TypeVar, Union, overload+from typing import Self, TypeAlias, TypeVar, overloadimport numpy as npimport numpy.typing as npt-from typing_extensions import Self, TypeAlias, TypeIs, override+from typing_extensions import TypeIs, overridefrom manim.typing import (FloatHSL,@@ -1211,15 +1211,9 @@ class HSV(ManimColor):self.__alpha = value[3]-ParsableManimColor: TypeAlias = Union[- ManimColor,- int,- str,- IntRGBLike,- FloatRGBLike,- IntRGBALike,- FloatRGBALike,-]+ParsableManimColor: TypeAlias = (+ ManimColor | int | str | IntRGBLike | FloatRGBLike | IntRGBALike | FloatRGBALike+)"""`ParsableManimColor` represents all the types which can be parsedto a :class:`ManimColor` in Manim."""@@ -1424,7 +1418,7 @@ def color_gradient(floors[-1] = num_colors - 2return [rgb_to_color((rgbs[i] * (1 - alpha)) + (rgbs[i + 1] * alpha))- for i, alpha in zip(floors, alphas_mod1)+ for i, alpha in zip(floors, alphas_mod1, strict=False)]diff --git a/manim/utils/docbuild/module_parsing.py b/manim/utils/docbuild/module_parsing.pyindex 6e5a6bb2b..5228281dc 100644--- a/manim/utils/docbuild/module_parsing.py+++ b/manim/utils/docbuild/module_parsing.py@@ -6,9 +6,7 @@ import astimport sysfrom ast import Attribute, Name, Subscriptfrom pathlib import Path-from typing import Any--from typing_extensions import TypeAlias+from typing import Any, TypeAlias__all__ = ["parse_module_attributes"]diff --git a/manim/utils/iterables.py b/manim/utils/iterables.pyindex 165037a82..1c4b31946 100644--- a/manim/utils/iterables.py+++ b/manim/utils/iterables.py@@ -58,7 +58,7 @@ def adjacent_n_tuples(objects: Sequence[T], n: int) -> zip[tuple[T, ...]]:>>> list(adjacent_n_tuples([1, 2, 3, 4], 3))[(1, 2, 3), (2, 3, 4), (3, 4, 1), (4, 1, 2)]"""- return zip(*([*objects[k:], *objects[:k]] for k in range(n)))+ return zip(*([*objects[k:], *objects[:k]] for k in range(n)), strict=False)def adjacent_pairs(objects: Sequence[T]) -> zip[tuple[T, ...]]:diff --git a/manim/utils/opengl.py b/manim/utils/opengl.pyindex 0cb8d6c86..106ed194d 100644--- a/manim/utils/opengl.py+++ b/manim/utils/opengl.py@@ -9,8 +9,9 @@ from manim._config import configfrom manim.typing import ManimFloatif TYPE_CHECKING:+ from typing import TypeAlias+import numpy.typing as npt- from typing_extensions import TypeAliasfrom manim.typing import MatrixMN, Point3Ddiff --git a/manim/utils/space_ops.py b/manim/utils/space_ops.pyindex 819915a17..fedfdc731 100644--- a/manim/utils/space_ops.py+++ b/manim/utils/space_ops.py@@ -609,7 +609,7 @@ def find_intersection(# algorithm from https://en.wikipedia.org/wiki/Skew_lines#Nearest_pointsresult = []- for p0, v0, p1, v1 in zip(p0s, v0s, p1s, v1s):+ for p0, v0, p1, v1 in zip(p0s, v0s, p1s, v1s, strict=False):normal = cross(v1, cross(v0, v1))denom = max(np.dot(v0, normal), threshold)result += [p0 + np.dot(p1 - p0, normal) / denom * v0]@@ -736,7 +736,9 @@ def earclip_triangulation(verts: np.ndarray, ring_ends: list) -> list:# with holes is instead treated as a (very convex)# polygon with one edge. Do this by drawing connections# between rings close to each other- rings = [list(range(e0, e1)) for e0, e1 in zip([0, *ring_ends], ring_ends)]+ rings = [+ list(range(e0, e1)) for e0, e1 in zip([0, *ring_ends], ring_ends, strict=False)+ ]attached_rings = rings[:1]detached_rings = rings[1:]loop_connections = {}diff --git a/manim/utils/tex.py b/manim/utils/tex.pyindex 50f5f2dfc..6ef71777c 100644--- a/manim/utils/tex.py+++ b/manim/utils/tex.py@@ -14,7 +14,7 @@ from pathlib import Pathfrom typing import TYPE_CHECKING, Anyif TYPE_CHECKING:- from typing_extensions import Self+ from typing import Selffrom manim.typing import StrPathdiff --git a/mypy.ini b/mypy.iniindex 91ce5479c..4977b894e 100644--- a/mypy.ini+++ b/mypy.ini@@ -1,7 +1,7 @@[mypy]strict = Falsefiles = manim-python_version = 3.10+python_version = 3.11; plugins = numpy.typing.mypy_pluginignore_errors = Falsecache_fine_grained = True@@ -52,18 +52,30 @@ warn_return_any = True## disable_recursive_aliases = True+[mypy-manim.__main__]+ignore_errors = True+[mypy-manim._config.utils]ignore_errors = True+[mypy-manim._config.cli_colors]+ignore_errors = True+[mypy-manim.animation.animation]ignore_errors = True[mypy-manim.animation.creation]ignore_errors = True+[mypy-manim.animation.indication]+ignore_errors = True+[mypy-manim.animation.rotation]ignore_errors = True+[mypy-manim.animation.specialized]+ignore_errors = True+[mypy-manim.animation.speedmodifier]ignore_errors = True@@ -76,9 +88,21 @@ ignore_errors = True[mypy-manim.animation.updaters.mobject_update_utils]ignore_errors = True+[mypy-manim.camera.camera]+ignore_errors = True+[mypy-manim.camera.mapping_camera]ignore_errors = True+[mypy-manim.cli.default_group]+ignore_errors = True++[mypy-manim.mobject.geometry.boolean_ops]+ignore_errors = True++[mypy-manim.mobject.geometry.polygram]+ignore_errors = True+[mypy-manim.mobject.graphing.coordinate_systems]ignore_errors = True@@ -133,6 +157,90 @@ ignore_errors = True[mypy-manim.utils.hashing]ignore_errors = True+# Added temporarily due to current mypy failures+[mypy-manim.camera.three_d_camera]+ignore_errors = True++[mypy-manim.mobject.graphing.functions]+ignore_errors = True++[mypy-manim.mobject.graphing.number_line]+ignore_errors = True++[mypy-manim.mobject.graphing.probability]+ignore_errors = True++[mypy-manim.mobject.graphing.scale]+ignore_errors = True++[mypy-manim.mobject.matrix]+ignore_errors = True++[mypy-manim.mobject.opengl.opengl_geometry]+ignore_errors = True++[mypy-manim.mobject.opengl.opengl_mobject]+ignore_errors = True++[mypy-manim.mobject.svg.brace]+ignore_errors = True++[mypy-manim.mobject.svg.svg_mobject]+ignore_errors = True++[mypy-manim.mobject.text.code_mobject]+ignore_errors = True++[mypy-manim.mobject.three_d.polyhedra]+ignore_errors = True++[mypy-manim.mobject.three_d.three_d_utils]+ignore_errors = True++[mypy-manim.mobject.three_d.three_dimensions]+ignore_errors = True++[mypy-manim.renderer.shader]+ignore_errors = True++[mypy-manim.renderer.vectorized_mobject_rendering]+ignore_errors = True++[mypy-manim.scene.scene]+ignore_errors = True++[mypy-manim.scene.scene_file_writer]+ignore_errors = True++[mypy-manim.scene.vector_space_scene]+ignore_errors = True++[mypy-manim.utils.bezier]+ignore_errors = True++[mypy-manim.utils.color.core]+ignore_errors = True++[mypy-manim.utils.commands]+ignore_errors = True++[mypy-manim.utils.images]+ignore_errors = True++[mypy-manim.utils.iterables]+ignore_errors = True++[mypy-manim.utils.opengl]+ignore_errors = True++[mypy-manim.utils.paths]+ignore_errors = True++[mypy-manim.utils.space_ops]+ignore_errors = True++[mypy-manim.utils.testing._test_class_makers]+ignore_errors = True# ---------------- Stubless imported Modules --------------------------diff --git a/pyproject.toml b/pyproject.tomlindex 47b160455..c841db3dc 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -130,7 +130,7 @@ exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"][tool.ruff]line-length = 88-target-version = "py39"+target-version = "py311"extend-exclude = [".github",".hg",diff --git a/tests/module/mobject/geometry/test_unit_geometry.py b/tests/module/mobject/geometry/test_unit_geometry.pyindex 5cae37ac9..15c4acd2b 100644--- a/tests/module/mobject/geometry/test_unit_geometry.py+++ b/tests/module/mobject/geometry/test_unit_geometry.py@@ -89,7 +89,7 @@ def test_Polygram_get_vertex_groups():for vertex_groups in vertex_groups_arr:polygram = Polygram(*vertex_groups)poly_vertex_groups = polygram.get_vertex_groups()- for poly_group, group in zip(poly_vertex_groups, vertex_groups):+ for poly_group, group in zip(poly_vertex_groups, vertex_groups, strict=False):np.testing.assert_array_equal(poly_group, group)# If polygram is a Polygram of a vertex group containing the start vertex N times,diff --git a/tests/module/mobject/graphing/test_coordinate_system.py b/tests/module/mobject/graphing/test_coordinate_system.pyindex 470d9d007..504cf889e 100644--- a/tests/module/mobject/graphing/test_coordinate_system.py+++ b/tests/module/mobject/graphing/test_coordinate_system.py@@ -152,7 +152,7 @@ def test_coords_to_point_vectorized():def ref_func(*coords):result = np.array(origin)- for axis, number in zip(plane.get_axes(), coords):+ for axis, number in zip(plane.get_axes(), coords, strict=False):result += axis.number_to_point(number) - originreturn resultdiff --git a/tests/module/mobject/graphing/test_number_line.py b/tests/module/mobject/graphing/test_number_line.pyindex 552b24ebb..4cf226f71 100644--- a/tests/module/mobject/graphing/test_number_line.py+++ b/tests/module/mobject/graphing/test_number_line.py@@ -62,7 +62,7 @@ def test_add_labels():expected_label_length = 6num_line = NumberLine(x_range=[-4, 4])num_line.add_labels(- dict(zip(list(range(-3, 3)), [Integer(m) for m in range(-1, 5)])),+ dict(zip(list(range(-3, 3)), [Integer(m) for m in range(-1, 5)], strict=False)),)actual_label_length = len(num_line.labels)assert actual_label_length == expected_label_length, (diff --git a/tests/module/mobject/text/test_texmobject.py b/tests/module/mobject/text/test_texmobject.pyindex ca8e635ea..c47b30c10 100644--- a/tests/module/mobject/text/test_texmobject.py+++ b/tests/module/mobject/text/test_texmobject.py@@ -108,6 +108,7 @@ def test_multi_part_tex_with_empty_parts():for one_part_glyph, multi_part_glyph in zip(one_part_fomula.family_members_with_points(),multi_part_formula.family_members_with_points(),+ strict=False,):np.testing.assert_allclose(one_part_glyph.points, multi_part_glyph.points)diff --git a/tests/module/mobject/types/vectorized_mobject/test_vectorized_mobject.py b/tests/module/mobject/types/vectorized_mobject/test_vectorized_mobject.pyindex ded050787..6f921a7b3 100644--- a/tests/module/mobject/types/vectorized_mobject/test_vectorized_mobject.py+++ b/tests/module/mobject/types/vectorized_mobject/test_vectorized_mobject.py@@ -369,7 +369,7 @@ def test_vdict_init():# Test VDict made from a python dictVDict({"a": VMobject(), "b": VMobject(), "c": VMobject()})# Test VDict made using zip- VDict(zip(["a", "b", "c"], [VMobject(), VMobject(), VMobject()]))+ VDict(zip(["a", "b", "c"], [VMobject(), VMobject(), VMobject()], strict=False))# If the value is of type Mobject, must raise a TypeErrorwith pytest.raises(TypeError):VDict({"a": Mobject()})diff --git a/tests/opengl/test_number_line_opengl.py b/tests/opengl/test_number_line_opengl.pyindex 6f9742e52..8b5c838ef 100644--- a/tests/opengl/test_number_line_opengl.py+++ b/tests/opengl/test_number_line_opengl.py@@ -62,7 +62,7 @@ def test_add_labels():expected_label_length = 6num_line = NumberLine(x_range=[-4, 4])num_line.add_labels(- dict(zip(list(range(-3, 3)), [Integer(m) for m in range(-1, 5)])),+ dict(zip(list(range(-3, 3)), [Integer(m) for m in range(-1, 5)], strict=False)),)actual_label_length = len(num_line.labels)assert actual_label_length == expected_label_length, (diff --git a/tests/opengl/test_opengl_vectorized_mobject.py b/tests/opengl/test_opengl_vectorized_mobject.pyindex ae41f83b6..c1f7fe10b 100644--- a/tests/opengl/test_opengl_vectorized_mobject.py+++ b/tests/opengl/test_opengl_vectorized_mobject.py@@ -308,7 +308,13 @@ def test_vdict_init(using_opengl_renderer):# Test VDict made from a python dictVDict({"a": OpenGLVMobject(), "b": OpenGLVMobject(), "c": OpenGLVMobject()})# Test VDict made using zip- VDict(zip(["a", "b", "c"], [OpenGLVMobject(), OpenGLVMobject(), OpenGLVMobject()]))+ VDict(+ zip(+ ["a", "b", "c"],+ [OpenGLVMobject(), OpenGLVMobject(), OpenGLVMobject()],+ strict=False,+ )+ )# If the value is of type OpenGLMobject, must raise a TypeErrorwith pytest.raises(TypeError):VDict({"a": OpenGLMobject()})diff --git a/tests/test_graphical_units/test_axes.py b/tests/test_graphical_units/test_axes.pyindex 2e06300e4..f26333570 100644--- a/tests/test_graphical_units/test_axes.py+++ b/tests/test_graphical_units/test_axes.py@@ -32,7 +32,7 @@ def test_custom_coordinates(scene):ax = Axes(x_range=[0, 10])ax.add_coordinates(- dict(zip(list(range(1, 10)), [Tex("str") for _ in range(1, 10)])),+ dict(zip(list(range(1, 10)), [Tex("str") for _ in range(1, 10)], strict=False)),)scene.add(ax)diff --git a/tests/test_graphical_units/test_mobjects.py b/tests/test_graphical_units/test_mobjects.pyindex c76c8599d..b0a1da92b 100644--- a/tests/test_graphical_units/test_mobjects.py+++ b/tests/test_graphical_units/test_mobjects.py@@ -59,7 +59,7 @@ def test_vmobject_joint_types(scene):])lines = VGroup(*[angled_line.copy() for _ in range(len(LineJointType))])- for line, joint_type in zip(lines, LineJointType):+ for line, joint_type in zip(lines, LineJointType, strict=False):line.joint_type = joint_typelines.arrange(RIGHT, buff=1)diff --git a/tests/utils/logging_tester.py b/tests/utils/logging_tester.pyindex 1fd8b4b16..8d1d316f2 100644--- a/tests/utils/logging_tester.py+++ b/tests/utils/logging_tester.py@@ -35,7 +35,9 @@ def _check_logs(reference_logfile_path: Path, generated_logfile_path: Path) -> Nref_log = json.loads(ref)gen_log = json.loads(gen)diff_keys = [- d1[0] for d1, d2 in zip(ref_log.items(), gen_log.items()) if d1[1] != d2[1]+ d1[0]+ for d1, d2 in zip(ref_log.items(), gen_log.items(), strict=False)+ if d1[1] != d2[1]]# \n and \t don't not work in f-strings.newline = "\n"diff --git a/tests/utils/video_tester.py b/tests/utils/video_tester.pyindex 21b136b30..c3b545bd5 100644--- a/tests/utils/video_tester.py+++ b/tests/utils/video_tester.py@@ -59,7 +59,7 @@ def check_video_data(path_control_data: Path, path_video_gen: Path) -> None:f"expected {len(sec_index_exp)} sections ({', '.join([el['name'] for el in sec_index_exp])}), but {len(sec_index_gen)} ({', '.join([el['name'] for el in sec_index_gen])}) got generated (in '{path_sec_index_gen}')")# check individual sections- for sec_gen, sec_exp in zip(sec_index_gen, sec_index_exp):+ for sec_gen, sec_exp in zip(sec_index_gen, sec_index_exp, strict=False):assert_shallow_dict_compare(sec_gen,sec_exp,