Merge branch 'main' into latex_junk_remover

.flake8

@@ -1,6 +1,7 @@
 [flake8]
 # Exclude the grpc generated code
-exclude = ./manim/grpc/gen/*
+exclude = ./manim/grpc/gen/*, __pycache__,.git,
+per-file-ignores = __init__.py:F401
 max-complexity = 15
 max-line-length = 88
 statistics = True
@@ -9,7 +10,7 @@ rst-roles = attr,class,func,meth,mod,obj,ref,doc,exc
 rst-directives = manim, SEEALSO, seealso
 docstring-convention=numpy
 
-select = A,A00,B,B9,C4,C90,D,E,F,F,PT,RST,SIM,W
+select = A,A00,B,B9,C4,C90,D,E,F,F,PT,RST,SIM,W,F401
 
                 # General Compatibility
 extend-ignore = E203, W503, D202, D212, D213, D404
@@ -40,4 +41,4 @@ extend-ignore = E203, W503, D202, D212, D213, D404
 
                 # Plug-in: flake8-rst-docstrings
                 RST201, RST203, RST210, RST212, RST213, RST215,
-                RST301, RST303,
+                RST301, RST303, RST499

.github/workflows/ci.yml

@@ -65,7 +65,7 @@ jobs:
 
       - name: Install Texlive (Linux)
         if: runner.os == 'Linux'
-        uses: teatimeguest/setup-texlive-action@v2
+        uses: teatimeguest/setup-texlive-action@v3
         with:
           cache: true
           packages: scheme-basic fontspec inputenc fontenc tipa mathrsfs calligra xcolor standalone preview doublestroke ms everysel setspace rsfs relsize ragged2e fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super babel-english gnu-freefont mathastext cbfonts-fd xetex

.pre-commit-config.yaml

@@ -58,7 +58,7 @@ repos:
             flake8-simplify==0.14.1,
           ]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.4.1
+    rev: v1.5.1
     hooks:
       - id: mypy
         additional_dependencies:
@@ -69,6 +69,7 @@ repos:
             types-requests,
             types-setuptools,
           ]
+        files: ^manim/
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5

docs/source/contributing/typings.rst

@@ -2,102 +2,80 @@
 Adding Typings
 ==============
 
+.. warning::
+   This section is still a work in progress.
+
 Adding type hints to functions and parameters
 ---------------------------------------------
 
-.. warning::
-   This section is still a work in progress.
+Manim is currently in the process of adding type hints into the library. In this
+section, you will find information about the standards used and some general
+guidelines.
 
 If you've never used type hints before, this is a good place to get started:
 https://realpython.com/python-type-checking/#hello-types.
 
-When adding type hints to manim, there are some guidelines that should be followed:
+Typing standards
+~~~~~~~~~~~~~~~~
 
-* Coordinates have the typehint ``Sequence[float]``, e.g.
+Manim uses `mypy`_ to type check its codebase. You will find a list of
+configuration values in the ``mypy.ini`` configuration file.
 
-.. code:: py
+To be able to use the newest typing features not available in the lowest
+supported Python version, make use of `typing_extensions`_.
 
-    def set_points_as_corners(self, points: Sequence[float]) -> "VMobject":
-        """Given an array of points, set them as corner of the Vmobject."""
+To be able to use the new Union syntax (``|``) and builtins subscripting, use
+the ``from __future__ import annotations`` import.
 
-* ``**kwargs`` has no typehint
+.. _mypy: https://mypy-lang.org/
+.. _typing_extensions: https://pypi.org/project/typing-extensions/
 
-* Mobjects have the typehint "Mobject", e.g.
+Typing guidelines
+~~~~~~~~~~~~~~~~~
 
-.. code:: py
+* Manim has a dedicated :mod:`~.typing` module where type aliases are provided.
+  Most of them may seem redundant, in particular the ones related to ``numpy``.
+  This is in anticipation of the support for shape type hinting
+  (`related issue <https://github.com/numpy/numpy/issues/16544>`_). Besides the
+  pending shape support, using the correct type aliases will help users understand
+  which shape should be used.
 
-    def match_color(self, mobject: "Mobject"):
-        """Match the color with the color of another :class:`~.Mobject`."""
-        return self.set_color(mobject.get_color())
-
-* Colors have the typehint ``Color``, e.g.
-
-.. code:: py
-
-    def set_color(self, color: Color = YELLOW_C, family: bool = True):
-        """Condition is function which takes in one arguments, (x, y, z)."""
-
-* As ``float`` and ``Union[int, float]`` are the same, use only ``float``
-
-* For numpy arrays use the typehint ``np.ndarray``
-
-* Functions that does not return a value should get the type hint ``None``. (This annotations help catch the kinds of subtle bugs where you are trying to use a meaningless return value. )
+* Always use a type hint of ``None`` for functions that does not return
+  a value (this also applies to ``__init__``), e.g.:
 
 .. code:: py
 
     def height(self, value) -> None:
         self.scale_to_fit_height(value)
 
-* Parameters that are None by default should get the type hint ``Optional``
-
-.. code:: py
+* For variables representing paths, use the ``StrPath`` or ``StrOrBytesPath``
+  type alias defined in the :mod:`~.typing` module.
 
-    def rotate(
-        self,
-        angle,
-        axis=OUT,
-        about_point: Optional[Sequence[float]] = None,
-        **kwargs,
-    ):
-        pass
+* ``*args`` and ``**kwargs`` shouldn't be left untyped (in most cases you can
+  use ``Any``).
 
+* Following `PEP 484 <https://peps.python.org/pep-0484/#the-numeric-tower>`_,
+  use ``float`` instead of ``int | float``.
 
-* The ``__init__()`` method always should have None as its return type.
-
-* Functions and lambda functions should get the typehint ``Callable``
+* Mobjects have the typehint ``Mobject``, e.g.:
 
 .. code:: py
 
-    rate_func: Callable[[float], float] = lambda t: smooth(1 - t)
-
-
-* Assuming that typical path objects are either Paths or strs, one can use the typehint ``typing.Union[str, pathlib.Path]``
+    def match_color(self, mobject: "Mobject"):
+        """Match the color with the color of another :class:`~.Mobject`."""
+        return self.set_color(mobject.get_color())
 
-.. note::
-   As a helper for tool for typesets, you can use `typestring-parser
-   <https://github.com/Dominik1123/typestring-parser>`_
-   which can be accessed by first installing it via ``pip`` - ``pip install typestring-parser`` and
-   then using ``from typestring_parser import parse``.
+* Always parametrize generics (``list[int]`` instead of ``list``,
+  ``type[Any]`` instead of ``type``, etc.). This also applies to callables:
 
-.. doctest::
-    :options: +SKIP
+.. code:: py
 
-    >>> from typestring_parser import parse
-    >>> parse("int")
-    <class 'int'>
-    >>> parse("int or str")
-    typing.Union[int, str]
-    >>> parse("list of str or str")
-    typing.Union[typing.List[str], str]
-    >>> parse("list of (int, str)")
-    typing.List[typing.Tuple[int, str]]
+    rate_func: Callable[[float], float] = lambda t: smooth(1 - t)
 
 Missing Sections for typehints are:
 -----------------------------------
-* Tools for typehinting
-* Link to MyPy
+
 * Mypy and numpy import errors: https://realpython.com/python-type-checking/#running-mypy
-* Where to find the alias
-* When to use Object and when to use "Object".
-* The use of a TypeVar on the type hints for copy().
-* The definition and use of Protocols (like Sized, or Sequence, or Iterable...)
+* When to use ``object`` vs ``Any``
+* The use of a TypeVar on the type hints for ``copy()``.
+* The definition and use of Protocols (like ``Sized``, ``Sequence``, ``Iterable``...)

manim/_config/__init__.py

@@ -20,7 +20,6 @@
 ]
 
 parser = make_config_parser()
-logger: logging.Logger
 
 # The logger can be accessed from anywhere as manim.logger, or as
 # logging.getLogger("manim").  The console must be accessed as manim.console.

manim/_config/logger_utils.py

@@ -26,6 +26,7 @@
 
 if TYPE_CHECKING:
     from pathlib import Path
+
 HIGHLIGHTED_KEYWORDS = [  # these keywords are highlighted specially
     "Played",
     "animations",

manim/_config/utils.py

@@ -27,9 +27,9 @@
 
 from .. import constants
 from ..constants import RendererType
+from ..typing import StrPath
 from ..utils.color import ManimColor
 from ..utils.tex import TexTemplate, TexTemplateFromFile
-from ..utils.tex_templates import TexTemplateLibrary
 
 
 def config_file_paths() -> list[Path]:
@@ -76,7 +76,7 @@ def config_file_paths() -> list[Path]:
 
 
 def make_config_parser(
-    custom_file: str | os.PathLike | None = None,
+    custom_file: StrPath | None = None,
 ) -> configparser.ConfigParser:
     """Make a :class:`ConfigParser` object and load any ``.cfg`` files.
 

manim/animation/changing.py

@@ -6,7 +6,6 @@
 
 from typing import Callable
 
-from manim._config import config
 from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL
 from manim.mobject.types.vectorized_mobject import VGroup, VMobject
 from manim.utils.color import (

manim/animation/creation.py

@@ -92,7 +92,7 @@ def construct(self):
 from ..mobject.mobject import Group, Mobject
 from ..mobject.types.vectorized_mobject import VMobject
 from ..utils.bezier import integer_interpolate
-from ..utils.rate_functions import double_smooth, linear, smooth
+from ..utils.rate_functions import double_smooth, linear
 
 
 class ShowPartial(Animation):

manim/animation/indication.py

@@ -45,6 +45,7 @@ def construct(self):
 from manim.mobject.geometry.line import Line
 from manim.mobject.geometry.polygram import Rectangle
 from manim.mobject.geometry.shape_matchers import SurroundingRectangle
+from manim.scene.scene import Scene
 
 from .. import config
 from ..animation.animation import Animation
@@ -313,7 +314,7 @@ def _get_bounds(self, alpha: float) -> Tuple[float]:
         lower = max(lower, 0)
         return (lower, upper)
 
-    def clean_up_from_scene(self, scene: "Scene") -> None:
+    def clean_up_from_scene(self, scene: Scene) -> None:
         super().clean_up_from_scene(scene)
         for submob, start in self.get_all_families_zipped():
             submob.pointwise_become_partial(start, 0, 1)

manim/camera/camera.py

@@ -9,7 +9,6 @@
 import itertools as it
 import operator as op
 import pathlib
-import time
 from functools import reduce
 from typing import Any, Callable, Iterable