Use --py39-plus in pre-commit

.pre-commit-config.yaml

@@ -28,7 +28,7 @@ repos:
     hooks:
       - id: pyupgrade
         name: Update code to new python versions
-        args: [--py37-plus]
+        args: [--py39-plus]
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:

manim/_config/__init__.py

@@ -4,7 +4,8 @@
 
 import logging
 from contextlib import contextmanager
-from typing import Any, Generator
+from typing import Any
+from collections.abc import Generator
 
 from .cli_colors import parse_cli_ctx
 from .logger_utils import make_logger

manim/_config/utils.py

@@ -22,7 +22,8 @@
 import sys
 from collections.abc import Mapping, MutableMapping
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, ClassVar, Iterable, Iterator, NoReturn
+from typing import TYPE_CHECKING, Any, ClassVar, NoReturn
+from collections.abc import Iterable, Iterator
 
 import numpy as np
 

manim/animation/animation.py

@@ -15,7 +15,8 @@
 
 
 from copy import deepcopy
-from typing import TYPE_CHECKING, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Callable
+from collections.abc import Iterable, Sequence
 
 from typing_extensions import Self
 

manim/animation/composition.py

@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 import types
-from typing import TYPE_CHECKING, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Callable
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 

manim/animation/creation.py

@@ -76,7 +76,8 @@ def construct(self):
 
 
 import itertools as it
-from typing import TYPE_CHECKING, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Callable
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 

manim/animation/indication.py

@@ -37,7 +37,8 @@ def construct(self):
     "Blink",
 ]
 
-from typing import Callable, Iterable, Optional, Tuple, Type, Union
+from typing import Callable, Optional, Tuple, Type, Union
+from collections.abc import Iterable
 
 import numpy as np
 
@@ -305,7 +306,7 @@ def __init__(self, mobject: "VMobject", time_width: float = 0.1, **kwargs) -> No
         self.time_width = time_width
         super().__init__(mobject, remover=True, introducer=True, **kwargs)
 
-    def _get_bounds(self, alpha: float) -> Tuple[float]:
+    def _get_bounds(self, alpha: float) -> tuple[float]:
         tw = self.time_width
         upper = interpolate(0, 1 + tw, alpha)
         lower = upper - tw
@@ -459,7 +460,7 @@ def homotopy(
             y: float,
             z: float,
             t: float,
-        ) -> Tuple[float, float, float]:
+        ) -> tuple[float, float, float]:
             upper = interpolate(0, 1 + time_width, t)
             lower = upper - time_width
             relative_x = inverse_interpolate(x_min, x_max, x)
@@ -593,7 +594,7 @@ def construct(self):
     def __init__(
         self,
         mobject: Mobject,
-        shape: Type = Rectangle,
+        shape: type = Rectangle,
         fade_in=False,
         fade_out=False,
         time_width=0.3,

manim/animation/rotation.py

@@ -4,7 +4,8 @@
 
 __all__ = ["Rotating", "Rotate"]
 
-from typing import TYPE_CHECKING, Callable, Sequence
+from typing import TYPE_CHECKING, Callable
+from collections.abc import Sequence
 
 import numpy as np
 

manim/animation/specialized.py

@@ -2,7 +2,8 @@
 
 __all__ = ["Broadcast"]
 
-from typing import Any, Sequence
+from typing import Any
+from collections.abc import Sequence
 
 from manim.animation.transform import Restore
 

manim/animation/transform.py

@@ -28,7 +28,8 @@
 
 import inspect
 import types
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 

manim/camera/camera.py

@@ -9,7 +9,8 @@
 import operator as op
 import pathlib
 from functools import reduce
-from typing import Any, Callable, Iterable
+from typing import Any, Callable
+from collections.abc import Iterable
 
 import cairo
 import numpy as np

manim/mobject/graph.py

@@ -9,7 +9,8 @@
 
 import itertools as it
 from copy import copy
-from typing import TYPE_CHECKING, Any, Hashable, Iterable, Literal, Protocol, cast
+from typing import TYPE_CHECKING, Any, Literal, Protocol, cast
+from collections.abc import Hashable, Iterable
 
 import networkx as nx
 import numpy as np

manim/mobject/graphing/coordinate_systems.py

@@ -13,7 +13,8 @@
 
 import fractions as fr
 import numbers
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Callable, TypeVar, overload
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 from typing_extensions import Self

manim/mobject/graphing/functions.py

@@ -5,7 +5,8 @@
 __all__ = ["ParametricFunction", "FunctionGraph", "ImplicitFunction"]
 
 
-from typing import TYPE_CHECKING, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Callable
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 from isosurfaces import plot_isoline

manim/mobject/graphing/number_line.py

@@ -7,7 +7,8 @@
 __all__ = ["NumberLine", "UnitInterval"]
 
 
-from typing import TYPE_CHECKING, Callable, Iterable, Sequence
+from typing import TYPE_CHECKING, Callable
+from collections.abc import Iterable, Sequence
 
 if TYPE_CHECKING:
     from manim.mobject.geometry.tips import ArrowTip

manim/mobject/graphing/probability.py

@@ -5,7 +5,7 @@
 __all__ = ["SampleSpace", "BarChart"]
 
 
-from typing import Iterable, MutableSequence, Sequence
+from collections.abc import Iterable, MutableSequence, Sequence
 
 import numpy as np
 

manim/mobject/graphing/scale.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING, Any, Iterable
+from typing import TYPE_CHECKING, Any
+from collections.abc import Iterable
 
 import numpy as np
 

manim/mobject/matrix.py

@@ -40,7 +40,7 @@ def construct(self):
 
 
 import itertools as it
-from typing import Iterable, Sequence
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 

manim/mobject/mobject.py

@@ -16,7 +16,8 @@
 import warnings
 from functools import partialmethod, reduce
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable, Iterable, Literal
+from typing import TYPE_CHECKING, Callable, Literal
+from collections.abc import Iterable
 
 import numpy as np
 

manim/mobject/opengl/opengl_mobject.py

@@ -7,7 +7,7 @@
 import sys
 from functools import partialmethod, wraps
 from math import ceil
-from typing import Iterable, Sequence
+from collections.abc import Iterable, Sequence
 
 import moderngl
 import numpy as np

manim/mobject/opengl/opengl_surface.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Iterable
+from collections.abc import Iterable
 
 import moderngl
 import numpy as np

manim/mobject/opengl/opengl_vectorized_mobject.py

@@ -3,7 +3,8 @@
 import itertools as it
 import operator as op
 from functools import reduce, wraps
-from typing import Callable, Iterable, Sequence
+from typing import Callable
+from collections.abc import Iterable, Sequence
 
 import moderngl
 import numpy as np

manim/mobject/svg/brace.py

@@ -4,7 +4,7 @@
 
 __all__ = ["Brace", "BraceLabel", "ArcBrace", "BraceText", "BraceBetweenPoints"]
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 import svgelements as se

manim/mobject/table.py

@@ -65,7 +65,8 @@ def construct(self):
 
 
 import itertools as it
-from typing import Callable, Iterable, Sequence
+from typing import Callable
+from collections.abc import Iterable, Sequence
 
 from manim.mobject.geometry.line import Line
 from manim.mobject.geometry.polygram import Polygon

manim/mobject/text/numbers.py

@@ -4,7 +4,7 @@
 
 __all__ = ["DecimalNumber", "Integer", "Variable"]
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 

manim/mobject/text/tex_mobject.py

@@ -28,7 +28,7 @@
 import re
 from functools import reduce
 from textwrap import dedent
-from typing import Iterable
+from collections.abc import Iterable
 
 from manim import config, logger
 from manim.constants import *

manim/mobject/text/text_mobject.py

@@ -61,7 +61,7 @@ def construct(self):
 from contextlib import contextmanager
 from itertools import chain
 from pathlib import Path
-from typing import Iterable, Sequence
+from collections.abc import Iterable, Sequence
 
 import manimpango
 import numpy as np
@@ -412,7 +412,7 @@ def construct(self):
     """
 
     @staticmethod
-    @functools.lru_cache(maxsize=None)
+    @functools.cache
     def font_list() -> list[str]:
         return manimpango.list_fonts()
 
@@ -1155,7 +1155,7 @@ def construct(self):
     """
 
     @staticmethod
-    @functools.lru_cache(maxsize=None)
+    @functools.cache
     def font_list() -> list[str]:
         return manimpango.list_fonts()
 

manim/mobject/three_d/three_dimensions.py

@@ -19,7 +19,8 @@
     "Torus",
 ]
 
-from typing import Any, Callable, Iterable, Sequence
+from typing import Any, Callable
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 from typing_extensions import Self

manim/mobject/types/vectorized_mobject.py

@@ -17,13 +17,9 @@
 from typing import (
     TYPE_CHECKING,
     Callable,
-    Generator,
-    Hashable,
-    Iterable,
     Literal,
-    Mapping,
-    Sequence,
 )
+from collections.abc import Generator, Hashable, Iterable, Mapping, Sequence
 
 import numpy as np
 from PIL.Image import Image

manim/mobject/vector_field.py

@@ -11,7 +11,8 @@
 import itertools as it
 import random
 from math import ceil, floor
-from typing import Callable, Iterable, Sequence
+from typing import Callable
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 from PIL import Image

manim/renderer/cairo_renderer.py

@@ -15,7 +15,8 @@
 
 if typing.TYPE_CHECKING:
     import types
-    from typing import Any, Iterable
+    from typing import Any
+    from collections.abc import Iterable
 
     from manim.animation.animation import Animation
     from manim.scene.scene import Scene

manim/renderer/opengl_renderer.py

@@ -5,10 +5,7 @@
 import time
 from typing import Any
 
-if sys.version_info < (3, 8):
-    from backports.cached_property import cached_property
-else:
-    from functools import cached_property
+from functools import cached_property
 
 import moderngl
 import numpy as np

manim/scene/scene.py

@@ -52,7 +52,8 @@
 from ..utils.iterables import list_difference_update, list_update
 
 if TYPE_CHECKING:
-    from typing import Callable, Iterable
+    from typing import Callable
+    from collections.abc import Iterable
 
 
 class RerunSceneHandler(FileSystemEventHandler):

manim/scene/three_d_scene.py

@@ -6,7 +6,7 @@
 
 
 import warnings
-from typing import Iterable, Sequence
+from collections.abc import Iterable, Sequence
 
 import numpy as np
 

manim/utils/bezier.py

@@ -32,7 +32,8 @@
 
 
 from functools import reduce
-from typing import Any, Callable, Sequence, overload
+from typing import Any, Callable, overload
+from collections.abc import Sequence
 
 import numpy as np
 import numpy.typing as npt

manim/utils/color/__init__.py

@@ -53,6 +53,6 @@
 from .core import *
 from .manim_colors import *
 
-_all_color_dict: Dict[str, ManimColor] = {
+_all_color_dict: dict[str, ManimColor] = {
     k: v for k, v in globals().items() if isinstance(v, ManimColor)
 }