A community-maintained Python framework for creating mathematical animations.
Refactor imports from `collections.abc`, `typing` and `typing_extensions` for Python 3.9 (#4353)
Francisco Manríquez Novoa05cc4140144c
diff --git a/.github/scripts/ci_build_cairo.py b/.github/scripts/ci_build_cairo.pyindex 469db7b45..be50793a9 100644--- a/.github/scripts/ci_build_cairo.py+++ b/.github/scripts/ci_build_cairo.py@@ -14,8 +14,8 @@ import subprocessimport sysimport tarfileimport tempfile-import typingimport urllib.request+from collections.abc import Generatorfrom contextlib import contextmanagerfrom pathlib import Pathfrom sys import stdout@@ -67,7 +67,7 @@ def run_command(command, cwd=None, env=None):@contextmanager-def gha_group(title: str) -> typing.Generator:+def gha_group(title: str) -> Generator:if not is_ci():yieldreturndiff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex 0eab06843..5de7605f8 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -14,10 +14,10 @@ from ..utils.rate_functions import linear, smooth__all__ = ["Animation", "Wait", "Add", "override_animation"]-from collections.abc import Iterable, Sequence+from collections.abc import Callable, Iterable, Sequencefrom copy import deepcopyfrom functools import partialmethod-from typing import TYPE_CHECKING, Any, Callable+from typing import TYPE_CHECKING, Anyfrom typing_extensions import Selfdiff --git a/manim/animation/changing.py b/manim/animation/changing.pyindex caa4dc194..9b5617f15 100644--- a/manim/animation/changing.py+++ b/manim/animation/changing.py@@ -4,10 +4,10 @@ from __future__ import annotations__all__ = ["AnimatedBoundary", "TracedPath"]-from collections.abc import Sequence-from typing import Callable+from collections.abc import Callable, Sequence+from typing import Any-from typing_extensions import Any, Self+from typing_extensions import Selffrom manim.mobject.mobject import Mobjectfrom manim.mobject.opengl.opengl_compatibility import ConvertToOpenGLdiff --git a/manim/animation/composition.py b/manim/animation/composition.pyindex 0f319d27a..a9da6f890 100644--- a/manim/animation/composition.py+++ b/manim/animation/composition.py@@ -2,8 +2,8 @@from __future__ import annotations-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Any, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKING, Anyimport numpy as npdiff --git a/manim/animation/creation.py b/manim/animation/creation.pyindex eba59262c..654100707 100644--- a/manim/animation/creation.py+++ b/manim/animation/creation.py@@ -76,8 +76,8 @@ __all__ = [import itertools as it-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKINGimport numpy as npdiff --git a/manim/animation/fading.py b/manim/animation/fading.pyindex 99b9bfe19..480ecc8fc 100644--- a/manim/animation/fading.py+++ b/manim/animation/fading.py@@ -19,8 +19,9 @@ __all__ = ["FadeIn",]+from typing import Any+import numpy as np-from typing_extensions import Anyfrom manim.mobject.opengl.opengl_mobject import OpenGLMobjectdiff --git a/manim/animation/growing.py b/manim/animation/growing.pyindex 70a17ffaf..889de79fc 100644--- a/manim/animation/growing.py+++ b/manim/animation/growing.py@@ -31,15 +31,13 @@ __all__ = ["SpinInFromNothing",]-import typing+from typing import TYPE_CHECKING, Anyfrom ..animation.transform import Transformfrom ..constants import PIfrom ..utils.paths import spiral_path-if typing.TYPE_CHECKING:- from typing import Any-+if TYPE_CHECKING:from manim.mobject.geometry.line import Arrowfrom manim.mobject.opengl.opengl_mobject import OpenGLMobjectfrom manim.typing import Point3DLike, Vector3DLikediff --git a/manim/animation/numbers.py b/manim/animation/numbers.pyindex 07f21c8db..e8724c4d3 100644--- a/manim/animation/numbers.py+++ b/manim/animation/numbers.py@@ -5,9 +5,8 @@ from __future__ import annotations__all__ = ["ChangingDecimal", "ChangeDecimalToValue"]-import typing--from typing_extensions import Any+from collections.abc import Callable+from typing import Anyfrom manim.mobject.text.numbers import DecimalNumber@@ -54,7 +53,7 @@ class ChangingDecimal(Animation):def __init__(self,decimal_mob: DecimalNumber,- number_update_func: typing.Callable[[float], float],+ number_update_func: Callable[[float], float],suspend_mobject_updating: bool = False,**kwargs: Any,) -> None:diff --git a/manim/animation/rotation.py b/manim/animation/rotation.pyindex c90715b09..2673c8cba 100644--- a/manim/animation/rotation.py+++ b/manim/animation/rotation.py@@ -4,11 +4,10 @@ from __future__ import annotations__all__ = ["Rotating", "Rotate"]-from collections.abc import Sequence-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable, Sequence+from typing import TYPE_CHECKING, Anyimport numpy as np-from typing_extensions import Anyfrom ..animation.animation import Animationfrom ..animation.transform import Transformdiff --git a/manim/animation/speedmodifier.py b/manim/animation/speedmodifier.pyindex b8ccea66d..b762f88b6 100644--- a/manim/animation/speedmodifier.py+++ b/manim/animation/speedmodifier.py@@ -4,7 +4,8 @@ from __future__ import annotationsimport inspectimport types-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable+from typing import TYPE_CHECKINGfrom numpy import piecewisediff --git a/manim/animation/transform.py b/manim/animation/transform.pyindex 8dd46cd84..5bf5b7693 100644--- a/manim/animation/transform.py+++ b/manim/animation/transform.py@@ -28,8 +28,8 @@ __all__ = [import inspectimport types-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Any, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKING, Anyimport numpy as npdiff --git a/manim/animation/updaters/mobject_update_utils.py b/manim/animation/updaters/mobject_update_utils.pyindex 213180f3b..a332b44cc 100644--- a/manim/animation/updaters/mobject_update_utils.py+++ b/manim/animation/updaters/mobject_update_utils.py@@ -15,7 +15,8 @@ __all__ = [import inspect-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable+from typing import TYPE_CHECKINGimport numpy as npdiff --git a/manim/animation/updaters/update.py b/manim/animation/updaters/update.pyindex 893690af1..29e636db5 100644--- a/manim/animation/updaters/update.py+++ b/manim/animation/updaters/update.py@@ -6,14 +6,12 @@ __all__ = ["UpdateFromFunc", "UpdateFromAlphaFunc", "MaintainPositionRelativeTo"import operator as op-import typing-from typing import Callable--from typing_extensions import Any+from collections.abc import Callable+from typing import TYPE_CHECKING, Anyfrom manim.animation.animation import Animation-if typing.TYPE_CHECKING:+if TYPE_CHECKING:from manim.mobject.mobject import Mobjectdiff --git a/manim/camera/camera.py b/manim/camera/camera.pyindex dc30cc06c..e2137fc85 100644--- a/manim/camera/camera.py+++ b/manim/camera/camera.py@@ -8,9 +8,9 @@ import copyimport itertools as itimport operator as opimport pathlib-from collections.abc import Iterable+from collections.abc import Callable, Iterablefrom functools import reduce-from typing import TYPE_CHECKING, Any, Callable+from typing import TYPE_CHECKING, Anyimport cairoimport numpy as npdiff --git a/manim/cli/checkhealth/checks.py b/manim/cli/checkhealth/checks.pyindex ec9c07dec..aabb2b3b4 100644--- a/manim/cli/checkhealth/checks.py+++ b/manim/cli/checkhealth/checks.py@@ -6,7 +6,8 @@ from __future__ import annotationsimport osimport shutil-from typing import Callable, Protocol, cast+from collections.abc import Callable+from typing import Protocol, cast__all__ = ["HEALTH_CHECKS"]diff --git a/manim/cli/default_group.py b/manim/cli/default_group.pyindex 579a3e3a0..e3cdcb710 100644--- a/manim/cli/default_group.py+++ b/manim/cli/default_group.py@@ -13,7 +13,8 @@ In particular, this class is what allows ``manim`` to act as ``manim render``.from __future__ import annotationsimport warnings-from typing import TYPE_CHECKING, Any, Callable+from collections.abc import Callable+from typing import TYPE_CHECKING, Anyimport cloupdiff --git a/manim/mobject/frame.py b/manim/mobject/frame.pyindex c721dc7a5..698e1b724 100644--- a/manim/mobject/frame.py+++ b/manim/mobject/frame.py@@ -8,7 +8,7 @@ __all__ = []-from typing_extensions import Any+from typing import Anyfrom manim.mobject.geometry.polygram import Rectanglediff --git a/manim/mobject/geometry/arc.py b/manim/mobject/geometry/arc.pyindex 87e692ea4..8b9e832a5 100644--- a/manim/mobject/geometry/arc.py+++ b/manim/mobject/geometry/arc.py@@ -44,7 +44,7 @@ __all__ = [import itertoolsimport warnings-from typing import TYPE_CHECKING, cast+from typing import TYPE_CHECKING, Any, castimport numpy as npfrom typing_extensions import Self@@ -64,7 +64,6 @@ from manim.utils.space_ops import (if TYPE_CHECKING:from collections.abc import Iterable- from typing import Anyimport manim.mobject.geometry.tips as tipsfrom manim.mobject.mobject import Mobjectdiff --git a/manim/mobject/geometry/boolean_ops.py b/manim/mobject/geometry/boolean_ops.pyindex f02b4f7be..ea5aa38ef 100644--- a/manim/mobject/geometry/boolean_ops.py+++ b/manim/mobject/geometry/boolean_ops.py@@ -2,7 +2,7 @@from __future__ import annotations-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Anyimport numpy as npfrom pathops import Path as SkiaPath@@ -13,8 +13,6 @@ from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGLfrom manim.mobject.types.vectorized_mobject import VMobjectif TYPE_CHECKING:- from typing import Any-from manim.typing import Point2DLike_Array, Point3D_Array, Point3DLike_Arrayfrom ...constants import RendererTypediff --git a/manim/mobject/geometry/labeled.py b/manim/mobject/geometry/labeled.pyindex 51b74ccb4..a9fa8c891 100644--- a/manim/mobject/geometry/labeled.py+++ b/manim/mobject/geometry/labeled.py@@ -4,7 +4,7 @@ from __future__ import annotations__all__ = ["Label", "LabeledLine", "LabeledArrow", "LabeledPolygram"]-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Anyimport numpy as np@@ -22,8 +22,6 @@ from manim.utils.color import WHITEfrom manim.utils.polylabel import polylabelif TYPE_CHECKING:- from typing import Any-from manim.typing import Point3DLike_Arraydiff --git a/manim/mobject/geometry/line.py b/manim/mobject/geometry/line.pyindex 6901819c6..9b0553d1b 100644--- a/manim/mobject/geometry/line.py+++ b/manim/mobject/geometry/line.py@@ -14,7 +14,7 @@ __all__ = ["RightAngle",]-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Any, Literalimport numpy as np@@ -30,9 +30,7 @@ from manim.utils.color import WHITEfrom manim.utils.space_ops import angle_of_vector, line_intersection, normalizeif TYPE_CHECKING:- from typing import Any-- from typing_extensions import Literal, Self, TypeAlias+ from typing_extensions 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 5a8dabdac..3274d29ff 100644--- a/manim/mobject/geometry/polygram.py+++ b/manim/mobject/geometry/polygram.py@@ -18,7 +18,7 @@ __all__ = [from math import ceil-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Any, Literalimport numpy as np@@ -32,8 +32,6 @@ from manim.utils.qhull import QuickHullfrom manim.utils.space_ops import angle_between_vectors, normalize, regular_verticesif TYPE_CHECKING:- from typing import Any, Literal-import numpy.typing as nptfrom typing_extensions import Selfdiff --git a/manim/mobject/geometry/tips.py b/manim/mobject/geometry/tips.pyindex ea7c6c241..5080aa877 100644--- a/manim/mobject/geometry/tips.py+++ b/manim/mobject/geometry/tips.py@@ -13,7 +13,7 @@ __all__ = ["StealthTip",]-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Anyimport numpy as np@@ -25,8 +25,6 @@ from manim.mobject.types.vectorized_mobject import VMobjectfrom manim.utils.space_ops import angle_of_vectorif TYPE_CHECKING:- from typing import Any-from manim.typing import Point3D, Vector3Ddiff --git a/manim/mobject/graphing/coordinate_systems.py b/manim/mobject/graphing/coordinate_systems.pyindex e19bc99bc..7e6f626ba 100644--- a/manim/mobject/graphing/coordinate_systems.py+++ b/manim/mobject/graphing/coordinate_systems.py@@ -13,8 +13,8 @@ __all__ = [import fractions as frimport numbers-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Any, Callable, TypeVar, overload+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKING, Any, TypeVar, overloadimport numpy as npfrom typing_extensions import Selfdiff --git a/manim/mobject/graphing/functions.py b/manim/mobject/graphing/functions.pyindex 44e0c3704..0ce39267a 100644--- a/manim/mobject/graphing/functions.py+++ b/manim/mobject/graphing/functions.py@@ -5,8 +5,8 @@ from __future__ import annotations__all__ = ["ParametricFunction", "FunctionGraph", "ImplicitFunction"]-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKINGimport numpy as npfrom isosurfaces import plot_isolinediff --git a/manim/mobject/graphing/number_line.py b/manim/mobject/graphing/number_line.pyindex 14964bffc..66772e74d 100644--- a/manim/mobject/graphing/number_line.py+++ b/manim/mobject/graphing/number_line.py@@ -8,8 +8,8 @@ from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject__all__ = ["NumberLine", "UnitInterval"]-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKINGif TYPE_CHECKING:from typing import Anydiff --git a/manim/mobject/logo.py b/manim/mobject/logo.pyindex bbeb1fa66..3cdab467f 100644--- a/manim/mobject/logo.py+++ b/manim/mobject/logo.py@@ -4,8 +4,9 @@ from __future__ import annotations__all__ = ["ManimBanner"]+from typing import Any+import svgelements as se-from typing_extensions import Anyfrom manim.animation.updaters.update import UpdateFromAlphaFuncfrom manim.mobject.geometry.arc import Circlediff --git a/manim/mobject/matrix.py b/manim/mobject/matrix.pyindex f10483f5c..36513e4e1 100644--- a/manim/mobject/matrix.py+++ b/manim/mobject/matrix.py@@ -40,8 +40,8 @@ __all__ = [import itertools as it-from collections.abc import Iterable, Sequence-from typing import Any, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import Anyimport numpy as npfrom typing_extensions import Selfdiff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.pyindex 2fe7d7cb0..e313a9e71 100644--- a/manim/mobject/mobject.py+++ b/manim/mobject/mobject.py@@ -14,10 +14,10 @@ import randomimport sysimport typesimport warnings-from collections.abc import Iterable+from collections.abc import Callable, Iterablefrom functools import partialmethod, reducefrom pathlib import Path-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Any, Literalimport numpy as np@@ -41,8 +41,6 @@ from ..utils.paths import straight_pathfrom ..utils.space_ops import angle_between_vectors, normalize, rotation_matrixif TYPE_CHECKING:- from typing import Any, Callable, Literal-from typing_extensions import Self, TypeAliasfrom manim.typing import (diff --git a/manim/mobject/opengl/opengl_mobject.py b/manim/mobject/opengl/opengl_mobject.pyindex 0b08123e8..c8312eddc 100644--- a/manim/mobject/opengl/opengl_mobject.py+++ b/manim/mobject/opengl/opengl_mobject.py@@ -6,10 +6,10 @@ import itertools as itimport randomimport sysimport types-from collections.abc import Iterable, Iterator, Sequence+from collections.abc import Callable, Iterable, Iterator, Sequencefrom functools import partialmethod, wrapsfrom math import ceil-from typing import TYPE_CHECKING, Any, Callable, TypeVar+from typing import TYPE_CHECKING, Any, TypeVarimport modernglimport numpy as npdiff --git a/manim/mobject/opengl/opengl_vectorized_mobject.py b/manim/mobject/opengl/opengl_vectorized_mobject.pyindex df2471f5f..d8ced06d6 100644--- a/manim/mobject/opengl/opengl_vectorized_mobject.py+++ b/manim/mobject/opengl/opengl_vectorized_mobject.py@@ -2,9 +2,9 @@ from __future__ import annotationsimport itertools as itimport operator as op-from collections.abc import Iterable, Sequence+from collections.abc import Callable, Iterable, Sequencefrom functools import reduce, wraps-from typing import Any, Callable+from typing import Anyimport modernglimport numpy as npdiff --git a/manim/mobject/table.py b/manim/mobject/table.pyindex 9d65263df..432fa1a42 100644--- a/manim/mobject/table.py+++ b/manim/mobject/table.py@@ -65,8 +65,7 @@ __all__ = [import itertools as it-from collections.abc import Iterable, Sequence-from typing import Callable+from collections.abc import Callable, Iterable, Sequencefrom manim.mobject.geometry.line import Linefrom manim.mobject.geometry.polygram import Polygondiff --git a/manim/mobject/three_d/three_dimensions.py b/manim/mobject/three_d/three_dimensions.pyindex be609622d..161b86dc8 100644--- a/manim/mobject/three_d/three_dimensions.py+++ b/manim/mobject/three_d/three_dimensions.py@@ -16,8 +16,8 @@ __all__ = ["Torus",]-from collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Any, Callable+from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKING, Anyimport numpy as npfrom typing_extensions import Selfdiff --git a/manim/mobject/types/image_mobject.py b/manim/mobject/types/image_mobject.pyindex baaa7d5a8..d2cb1a3f0 100644--- a/manim/mobject/types/image_mobject.py+++ b/manim/mobject/types/image_mobject.py@@ -5,7 +5,7 @@ from __future__ import annotations__all__ = ["AbstractImageMobject", "ImageMobject", "ImageMobjectFromCamera"]import pathlib-from typing import TYPE_CHECKING+from typing import TYPE_CHECKING, Anyimport numpy as npfrom PIL import Image@@ -24,8 +24,6 @@ from ...utils.images import change_to_rgba_array, get_full_raster_image_path__all__ = ["ImageMobject", "ImageMobjectFromCamera"]if TYPE_CHECKING:- from typing import Any-import numpy.typing as nptfrom typing_extensions import Selfdiff --git a/manim/mobject/types/point_cloud_mobject.py b/manim/mobject/types/point_cloud_mobject.pyindex e88980dd3..f820f49bf 100644--- a/manim/mobject/types/point_cloud_mobject.py+++ b/manim/mobject/types/point_cloud_mobject.py@@ -4,7 +4,8 @@ from __future__ import annotations__all__ = ["PMobject", "Mobject1D", "Mobject2D", "PGroup", "PointCloudDot", "Point"]-from typing import TYPE_CHECKING+from collections.abc import Callable+from typing import TYPE_CHECKING, Anyimport numpy as np@@ -29,9 +30,6 @@ from ...utils.iterables import stretch_array_to_length__all__ = ["PMobject", "Mobject1D", "Mobject2D", "PGroup", "PointCloudDot", "Point"]if TYPE_CHECKING:- from collections.abc import Callable- from typing import Any-import numpy.typing as nptfrom typing_extensions import Selfdiff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.pyindex 16c2ab65a..f937d8ab5 100644--- a/manim/mobject/types/vectorized_mobject.py+++ b/manim/mobject/types/vectorized_mobject.py@@ -13,8 +13,8 @@ __all__ = [import itertools as itimport sys-from collections.abc import Hashable, Iterable, Mapping, Sequence-from typing import TYPE_CHECKING, Callable, Literal+from collections.abc import Callable, Hashable, Iterable, Mapping, Sequence+from typing import TYPE_CHECKING, Any, Literalimport numpy as npfrom PIL.Image import Image@@ -47,8 +47,6 @@ from manim.utils.iterables import (from manim.utils.space_ops import rotate_vector, shoelace_directionif TYPE_CHECKING:- from typing import Any-import numpy.typing as nptfrom typing_extensions import Selfdiff --git a/manim/mobject/vector_field.py b/manim/mobject/vector_field.pyindex 28f5c6d26..44b3be6c0 100644--- a/manim/mobject/vector_field.py+++ b/manim/mobject/vector_field.py@@ -10,9 +10,8 @@ __all__ = [import itertools as itimport random-from collections.abc import Iterable, Sequence+from collections.abc import Callable, Iterable, Sequencefrom math import ceil, floor-from typing import Callableimport numpy as npfrom PIL import Imagediff --git a/manim/renderer/cairo_renderer.py b/manim/renderer/cairo_renderer.pyindex 0b8de4c13..351203a87 100644--- a/manim/renderer/cairo_renderer.py+++ b/manim/renderer/cairo_renderer.py@@ -1,6 +1,7 @@from __future__ import annotations-import typing+from collections.abc import Iterable+from typing import TYPE_CHECKING, Anyimport numpy as np@@ -13,9 +14,7 @@ from ..scene.scene_file_writer import SceneFileWriterfrom ..utils.exceptions import EndSceneEarlyExceptionfrom ..utils.iterables import list_update-if typing.TYPE_CHECKING:- from typing import Any-+if TYPE_CHECKING:from manim.animation.animation import Animationfrom manim.scene.scene import Scene@@ -120,7 +119,7 @@ class CairoRenderer:def update_frame( # TODO Description in Docstringself,scene: Scene,- mobjects: typing.Iterable[Mobject] | None = None,+ mobjects: Iterable[Mobject] | None = None,include_submobjects: bool = True,ignore_skipping: bool = True,**kwargs: Any,@@ -214,8 +213,8 @@ class CairoRenderer:def save_static_frame_data(self,scene: Scene,- static_mobjects: typing.Iterable[Mobject],- ) -> typing.Iterable[Mobject] | None:+ static_mobjects: Iterable[Mobject],+ ) -> Iterable[Mobject] | None:"""Compute and save the static frame, that will be reused at each frameto avoid unnecessarily computing static mobjects.diff --git a/manim/renderer/vectorized_mobject_rendering.py b/manim/renderer/vectorized_mobject_rendering.pyindex fafe7844e..f03789e0e 100644--- a/manim/renderer/vectorized_mobject_rendering.py+++ b/manim/renderer/vectorized_mobject_rendering.py@@ -1,6 +1,6 @@from __future__ import annotations-import collections+from collections import defaultdictfrom collections.abc import Iterable, Sequencefrom typing import TYPE_CHECKING@@ -25,9 +25,9 @@ __all__ = [def build_matrix_lists(mob: OpenGLVMobject,-) -> collections.defaultdict[tuple[float, ...], list[OpenGLVMobject]]:+) -> defaultdict[tuple[float, ...], list[OpenGLVMobject]]:root_hierarchical_matrix = mob.hierarchical_model_matrix()- matrix_to_mobject_list = collections.defaultdict(list)+ matrix_to_mobject_list = defaultdict(list)if mob.has_points():matrix_to_mobject_list[tuple(root_hierarchical_matrix.ravel())].append(mob)mobject_to_hierarchical_matrix = {mob: root_hierarchical_matrix}diff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex 94d8715d3..52a58a59f 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -31,7 +31,9 @@ try:window = dpg.generate_uuid()except ImportError:dearpygui_imported = False-from typing import TYPE_CHECKING++from collections.abc import Callable, Iterable, Sequence+from typing import TYPE_CHECKING, Any, Unionimport numpy as npfrom tqdm import tqdm@@ -59,11 +61,9 @@ from ..utils.iterables import list_difference_update, list_updatefrom ..utils.module_ops import scene_classes_from_fileif TYPE_CHECKING:- from collections.abc import Iterable, Sequencefrom types import FrameType- from typing import Any, Callable, TypeAlias, Union- from typing_extensions import Self+ from typing_extensions import Self, TypeAliasfrom manim.typing import Point3Ddiff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.pyindex 3ceab6a9b..ccc378020 100644--- a/manim/scene/vector_space_scene.py+++ b/manim/scene/vector_space_scene.py@@ -4,8 +4,8 @@ from __future__ import annotations__all__ = ["VectorScene", "LinearTransformationScene"]-from collections.abc import Iterable-from typing import TYPE_CHECKING, Any, Callable, cast+from collections.abc import Callable, Iterable+from typing import TYPE_CHECKING, Any, castimport numpy as np@@ -45,8 +45,6 @@ from ..utils.rate_functions import rush_from, rush_intofrom ..utils.space_ops import angle_of_vectorif TYPE_CHECKING:- from typing import Any-from typing_extensions import Selffrom manim.typing import (diff --git a/manim/typing.py b/manim/typing.pyindex 0d296581a..5682ee4ee 100644--- a/manim/typing.py+++ b/manim/typing.py@@ -20,9 +20,9 @@from __future__ import annotations-from collections.abc import Sequence+from collections.abc import Callable, Sequencefrom os import PathLike-from typing import Callable, Union+from typing import Unionimport numpy as npimport numpy.typing as nptdiff --git a/manim/utils/bezier.py b/manim/utils/bezier.pyindex 28958309a..b50c7e236 100644--- a/manim/utils/bezier.py+++ b/manim/utils/bezier.py@@ -20,9 +20,9 @@ __all__ = []-from collections.abc import Sequence+from collections.abc import Callable, Sequencefrom functools import reduce-from typing import TYPE_CHECKING, Callable, overload+from typing import TYPE_CHECKING, overloadimport numpy as npdiff --git a/manim/utils/caching.py b/manim/utils/caching.pyindex 177bb11c5..0c339c914 100644--- a/manim/utils/caching.py+++ b/manim/utils/caching.py@@ -1,6 +1,7 @@from __future__ import annotations-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable+from typing import TYPE_CHECKING, Anyfrom .. import config, loggerfrom ..utils.hashing import get_hash_from_play_call@@ -8,8 +9,6 @@ from ..utils.hashing import get_hash_from_play_call__all__ = ["handle_caching_play"]if TYPE_CHECKING:- from typing import Any-from manim.renderer.opengl_renderer import OpenGLRendererfrom manim.scene.scene import Scenediff --git a/manim/utils/deprecation.py b/manim/utils/deprecation.pyindex 877f74507..b7a5febff 100644--- a/manim/utils/deprecation.py+++ b/manim/utils/deprecation.py@@ -8,8 +8,8 @@ __all__ = ["deprecated", "deprecated_params"]import inspectimport loggingimport re-from collections.abc import Iterable-from typing import Any, Callable, TypeVar, overload+from collections.abc import Callable, Iterable+from typing import Any, TypeVar, overloadfrom decorator import decorate, decoratordiff --git a/manim/utils/hashing.py b/manim/utils/hashing.pyindex 8619cc7e3..be680aef6 100644--- a/manim/utils/hashing.py+++ b/manim/utils/hashing.py@@ -2,21 +2,20 @@from __future__ import annotations-import collectionsimport copyimport inspectimport json-import typingimport zlib+from collections.abc import Callable, Hashable, Iterablefrom time import perf_counterfrom types import FunctionType, MappingProxyType, MethodType, ModuleType-from typing import Any+from typing import TYPE_CHECKING, Anyimport numpy as npfrom manim._config import config, logger-if typing.TYPE_CHECKING:+if TYPE_CHECKING:from manim.animation.animation import Animationfrom manim.camera.camera import Camerafrom manim.mobject.mobject import Mobject@@ -117,7 +116,7 @@ class _Memoizer:def _handle_already_processed(cls,obj,- default_function: typing.Callable[[Any], Any],+ default_function: Callable[[Any], Any],):if isinstance(obj,@@ -131,7 +130,7 @@ class _Memoizer:# It makes no sense (and it'd slower) to memoize objects of these primitive# types. Hence, we simply return the object.return obj- if isinstance(obj, collections.abc.Hashable):+ if isinstance(obj, Hashable):try:return cls._return(obj, hash, default_function)except TypeError:@@ -144,8 +143,8 @@ class _Memoizer:@classmethoddef _return(cls,- obj: typing.Any,- obj_to_membership_sign: typing.Callable[[Any], int],+ obj: Any,+ obj_to_membership_sign: Callable[[Any], int],default_func,memoizing=True,) -> str | Any:@@ -234,7 +233,7 @@ class _CustomEncoder(json.JSONEncoder):# Serialize it with only the type of the object. You can change this to whatever string when debugging the serialization process.return str(type(obj))- def _cleaned_iterable(self, iterable: typing.Iterable[Any]):+ def _cleaned_iterable(self, iterable: Iterable[Any]):"""Check for circular reference at each iterable that will go through the JSONEncoder, as well as key of the wrong format.If a key with a bad format is found (i.e not a int, string, or float), it gets replaced byt its hash using the same process implemented here.@@ -325,8 +324,8 @@ def get_json(obj: dict):def get_hash_from_play_call(scene_object: Scene,camera_object: Camera | OpenGLCamera,- animations_list: typing.Iterable[Animation],- current_mobjects_list: typing.Iterable[Mobject],+ animations_list: Iterable[Animation],+ current_mobjects_list: Iterable[Mobject],) -> str:"""Take the list of animations and a list of mobjects and output their hashes. This is meant to be used for `scene.play` function.diff --git a/manim/utils/iterables.py b/manim/utils/iterables.pyindex 678750deb..165037a82 100644--- a/manim/utils/iterables.py+++ b/manim/utils/iterables.py@@ -20,6 +20,7 @@ __all__ = [import itertools as itfrom collections.abc import (+ Callable,Collection,Generator,Hashable,@@ -27,7 +28,7 @@ from collections.abc import (Reversible,Sequence,)-from typing import TYPE_CHECKING, Callable, TypeVar, overload+from typing import TYPE_CHECKING, TypeVar, overloadimport numpy as npdiff --git a/manim/utils/module_ops.py b/manim/utils/module_ops.pyindex 1b03e374f..e4d921d8b 100644--- a/manim/utils/module_ops.py+++ b/manim/utils/module_ops.py@@ -7,7 +7,7 @@ import sysimport typesimport warningsfrom pathlib import Path-from typing import TYPE_CHECKING, Literal, overload+from typing import TYPE_CHECKING, Any, Literal, overloadfrom manim._config import config, console, loggerfrom manim.constants import (@@ -19,8 +19,6 @@ from manim.constants import (from manim.scene.scene_file_writer import SceneFileWriterif TYPE_CHECKING:- from typing import Any-from manim.scene.scene import Scene__all__ = ["scene_classes_from_file"]diff --git a/manim/utils/opengl.py b/manim/utils/opengl.pyindex 877cbc2e8..0cb8d6c86 100644--- a/manim/utils/opengl.py+++ b/manim/utils/opengl.py@@ -15,12 +15,6 @@ if TYPE_CHECKING:from manim.typing import MatrixMN, Point3D-if TYPE_CHECKING:- from typing_extensions import TypeAlias-- from manim.typing import MatrixMN--depth = 20__all__ = [diff --git a/manim/utils/simple_functions.py b/manim/utils/simple_functions.pyindex 373596065..792b7764d 100644--- a/manim/utils/simple_functions.py+++ b/manim/utils/simple_functions.py@@ -10,8 +10,9 @@ __all__ = []+from collections.abc import Callablefrom functools import lru_cache-from typing import Any, Callable, Protocol, TypeVar+from typing import Any, Protocol, TypeVarimport numpy as npfrom scipy import specialdiff --git a/manim/utils/space_ops.py b/manim/utils/space_ops.pyindex 472f45ab4..2bbecaa49 100644--- a/manim/utils/space_ops.py+++ b/manim/utils/space_ops.py@@ -3,8 +3,8 @@from __future__ import annotationsimport itertools as it-from collections.abc import Sequence-from typing import TYPE_CHECKING, Callable+from collections.abc import Callable, Sequence+from typing import TYPE_CHECKINGimport numpy as npfrom mapbox_earcut import triangulate_float32 as earcutdiff --git a/manim/utils/testing/_test_class_makers.py b/manim/utils/testing/_test_class_makers.pyindex fafd8cc76..b7b53306d 100644--- a/manim/utils/testing/_test_class_makers.py+++ b/manim/utils/testing/_test_class_makers.py@@ -1,6 +1,7 @@from __future__ import annotations-from typing import Any, Callable+from collections.abc import Callable+from typing import Anyfrom manim.renderer.cairo_renderer import CairoRendererfrom manim.renderer.opengl_renderer import OpenGLRendererdiff --git a/manim/utils/testing/frames_comparison.py b/manim/utils/testing/frames_comparison.pyindex 7b5f23f8c..01061d686 100644--- a/manim/utils/testing/frames_comparison.py+++ b/manim/utils/testing/frames_comparison.py@@ -2,8 +2,9 @@ from __future__ import annotationsimport functoolsimport inspect+from collections.abc import Callablefrom pathlib import Path-from typing import Any, Callable+from typing import Anyimport cairoimport pytest