A community-maintained Python framework for creating mathematical animations.
Format Imports using Isort (#1178)
Naveen M Kdcb90a86563a
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.ymlindex 6a911e953..56082efd5 100644--- a/.github/workflows/lint.yml+++ b/.github/workflows/lint.yml@@ -88,3 +88,22 @@ jobs:- name: Run Flake8run: |poetry run flake8 manim++ isort-checks:+ runs-on: windows-latest+ steps:+ - name: Set up Python+ uses: actions/setup-python@v2+ with:+ python-version: 3.9++ - name: Checkout the repository+ uses: actions/checkout@v2++ - name: Install Dependencies+ run: |+ pip install isort++ - name: Run Isort+ run: |+ isort -c .diff --git a/docs/source/manim_directive.py b/docs/source/manim_directive.pyindex 5709eaaff..7374e028d 100644--- a/docs/source/manim_directive.py+++ b/docs/source/manim_directive.py@@ -72,17 +72,16 @@ directive:that is rendered in a reference block after the source code."""-from docutils import nodes-from docutils.parsers.rst import directives, Directive-from docutils.statemachine import StringList--import jinja2import os+import shutilfrom os.path import relpathfrom pathlib import Pathfrom typing import List-import shutil+import jinja2+from docutils import nodes+from docutils.parsers.rst import Directive, directives+from docutils.statemachine import StringListfrom manim import QUALITIESdiff --git a/example_scenes/opengl.py b/example_scenes/opengl.pyindex d634e9680..01689f3b1 100644--- a/example_scenes/opengl.py+++ b/example_scenes/opengl.py@@ -1,8 +1,8 @@-from manim import *-from manim.opengl import *import osfrom pathlib import Path+from manim import *+from manim.opengl import *# Copied from https://3b1b.github.io/manim/getting_started/example_scenes.html#surfaceexample.# Lines that do not yet work with the Community Version are commented.diff --git a/manim/__init__.py b/manim/__init__.pyindex 64983268c..245d3c890 100644--- a/manim/__init__.py+++ b/manim/__init__.py@@ -11,11 +11,6 @@ __version__ = importlib_metadata.version(__name__)# Importing the config module should be the first thing we do, since other# modules depend on the global config dict for initialization.from ._config import *--from .constants import *--from .container import *-from .animation.animation import *from .animation.composition import *from .animation.creation import *@@ -28,17 +23,15 @@ from .animation.rotation import *from .animation.transform import *from .animation.transform_matching_parts import *from .animation.update import *--from .renderer.cairo_renderer import *-from .camera.camera import *from .camera.mapping_camera import *from .camera.moving_camera import *-from .camera.three_d_camera import *from .camera.multi_camera import *--from .mobject.coordinate_systems import *+from .camera.three_d_camera import *+from .constants import *+from .container import *from .mobject.changing import *+from .mobject.coordinate_systems import *from .mobject.frame import *from .mobject.functions import *from .mobject.geometry import *@@ -46,6 +39,7 @@ from .mobject.graph import *from .mobject.logo import *from .mobject.matrix import *from .mobject.mobject import *+from .mobject.mobject_update_utils import *from .mobject.number_line import *from .mobject.numbers import *from .mobject.probability import *@@ -62,42 +56,39 @@ from .mobject.three_dimensions import *from .mobject.types.image_mobject import *from .mobject.types.point_cloud_mobject import *from .mobject.types.vectorized_mobject import *-from .mobject.mobject_update_utils import *from .mobject.value_tracker import *from .mobject.vector_field import *-+from .renderer.cairo_renderer import *from .scene.graph_scene import *from .scene.moving_camera_scene import *from .scene.reconfigurable_scene import *--from .scene.scene import *from .scene.sample_space_scene import *+from .scene.scene import *+from .scene.scene_file_writer import *from .scene.three_d_scene import *from .scene.vector_space_scene import *from .scene.zoomed_scene import *-from .scene.scene_file_writer import *-+from .utils import color as color+from .utils import rate_functions, unitfrom .utils.bezier import *from .utils.color import *-from .utils import color as colorfrom .utils.config_ops import *from .utils.debug import *+from .utils.file_ops import *from .utils.images import *from .utils.iterables import *-from .utils.file_ops import *from .utils.paths import *from .utils.rate_functions import *-from .utils import rate_functionsfrom .utils.simple_functions import *from .utils.sounds import *from .utils.space_ops import *from .utils.strings import *from .utils.tex import *from .utils.tex_templates import *-from .utils import unittry:from IPython import get_ipython+from .utils.ipython_magic import ManimMagicexcept ImportError:passdiff --git a/manim/__main__.py b/manim/__main__.pyindex ba8c59060..6f40cb8db 100644--- a/manim/__main__.py+++ b/manim/__main__.py@@ -1,12 +1,13 @@import sys+import clickfrom click_default_group import DefaultGroup+from . import __version__, console-from .constants import EPILOG-from .constants import CONTEXT_SETTINGSfrom .cli.cfg.commands import cfgfrom .cli.plugins.commands import pluginsfrom .cli.render.commands import render+from .constants import CONTEXT_SETTINGS, EPILOGdef exit_early(ctx, param, value):diff --git a/manim/_config/utils.py b/manim/_config/utils.pyindex e55b5d9d2..08528588a 100644--- a/manim/_config/utils.py+++ b/manim/_config/utils.py@@ -12,9 +12,9 @@ See :doc:`/tutorials/configuration` for an introduction to Manim's configurationimport argparseimport configparserimport copy+import errnoimport loggingimport os-import errnoimport sysimport typingfrom collections.abc import Mapping, MutableMappingdiff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex 4c57ce391..cd85ab843 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -5,8 +5,8 @@ __all__ = ["Animation", "Wait"]import typing-from typing import Unionfrom copy import deepcopy+from typing import Unionimport numpy as np@@ -14,11 +14,10 @@ if typing.TYPE_CHECKING:from manim.scene.scene import Scenefrom .. import logger-from ..mobject import mobject-from ..mobject import opengl_mobject+from ..mobject import mobject, opengl_mobjectfrom ..mobject.mobject import Mobject-from ..utils.rate_functions import smoothfrom ..mobject.opengl_mobject import OpenGLMobject+from ..utils.rate_functions import smoothDEFAULT_ANIMATION_RUN_TIME: float = 1.0DEFAULT_ANIMATION_LAG_RATIO: float = 0.0diff --git a/manim/animation/creation.py b/manim/animation/creation.pyindex 82578a638..3066640ce 100644--- a/manim/animation/creation.py+++ b/manim/animation/creation.py@@ -76,8 +76,8 @@ import typingimport numpy as npfrom colour import Color-from .. import logger+from .. import loggerif typing.TYPE_CHECKING:from manim.mobject.svg.text_mobject import Text@@ -85,8 +85,8 @@ if typing.TYPE_CHECKING:from ..animation.animation import Animationfrom ..animation.composition import Successionfrom ..mobject.mobject import Group, Mobject-from ..mobject.types.vectorized_mobject import VMobjectfrom ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject+from ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.bezier import integer_interpolatefrom ..utils.rate_functions import double_smooth, linear, smoothdiff --git a/manim/animation/fading.py b/manim/animation/fading.pyindex b13dbc72f..8b0ae0230 100644--- a/manim/animation/fading.py+++ b/manim/animation/fading.py@@ -75,8 +75,8 @@ from ..animation.animation import Animationfrom ..animation.transform import Transformfrom ..constants import DOWN, ORIGINfrom ..mobject.mobject import Group-from ..mobject.types.vectorized_mobject import VMobjectfrom ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject+from ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.bezier import interpolatefrom ..utils.rate_functions import there_and_backdiff --git a/manim/animation/transform_matching_parts.py b/manim/animation/transform_matching_parts.pyindex d7a95e831..b3e99dbad 100644--- a/manim/animation/transform_matching_parts.py+++ b/manim/animation/transform_matching_parts.py@@ -3,16 +3,16 @@__all__ = ["TransformMatchingShapes", "TransformMatchingTex"]-import numpy as npfrom typing import List, Optional-from .composition import AnimationGroup-from .fading import FadeInFromPoint, FadeOutToPoint-from .transform import Transform, ReplacementTransform, FadeTransformPieces+import numpy as np-from ..mobject.mobject import Mobject, Group-from ..mobject.types.vectorized_mobject import VGroup, VMobject+from ..mobject.mobject import Group, Mobjectfrom ..mobject.svg.tex_mobject import MathTex+from ..mobject.types.vectorized_mobject import VGroup, VMobject+from .composition import AnimationGroup+from .fading import FadeInFromPoint, FadeOutToPoint+from .transform import FadeTransformPieces, ReplacementTransform, Transformclass TransformMatchingAbstractBase(AnimationGroup):diff --git a/manim/camera/camera.py b/manim/camera/camera.pyindex 7bf0808ef..f384cbf96 100644--- a/manim/camera/camera.py+++ b/manim/camera/camera.py@@ -3,30 +3,29 @@__all__ = ["Camera", "BackgroundColoredVMobjectDisplayer"]-from functools import reduce+import copyimport itertools as itimport operator as opimport time-import copy+from functools import reduce-from PIL import Image-from scipy.spatial.distance import pdistimport cairoimport numpy as np+from PIL import Image+from scipy.spatial.distance import pdist-from .. import logger, config+from .. import config, loggerfrom ..constants import *-from ..mobject.types.image_mobject import AbstractImageMobjectfrom ..mobject.mobject import Mobject+from ..mobject.types.image_mobject import AbstractImageMobjectfrom ..mobject.types.point_cloud_mobject import PMobjectfrom ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.color import color_to_int_rgba+from ..utils.family import extract_mobject_family_membersfrom ..utils.images import get_full_raster_image_pathfrom ..utils.iterables import list_difference_updatefrom ..utils.simple_functions import fdiv-from ..utils.space_ops import angle_of_vector-from ..utils.space_ops import get_norm-from ..utils.family import extract_mobject_family_members+from ..utils.space_ops import angle_of_vector, get_normclass Camera:diff --git a/manim/camera/webgl_camera.py b/manim/camera/webgl_camera.pyindex 48d31eb20..5d07560b5 100644--- a/manim/camera/webgl_camera.py+++ b/manim/camera/webgl_camera.py@@ -1,6 +1,7 @@-from .camera import Cameraimport copy+from .camera import Camera+class WebGLCamera(Camera):def __init__(self, **kwargs):diff --git a/manim/cli/cfg/commands.py b/manim/cli/cfg/commands.pyindex a187ddef3..959587235 100644--- a/manim/cli/cfg/commands.py+++ b/manim/cli/cfg/commands.py@@ -6,17 +6,16 @@ group."""import os-import click-from ast import literal_evalfrom typing import Union++import clickfrom rich.errors import StyleSyntaxErrorfrom rich.style import Stylefrom ... import config, console-from ...constants import EPILOG-from ...constants import CONTEXT_SETTINGSfrom ..._config.utils import config_file_paths, make_config_parser+from ...constants import CONTEXT_SETTINGS, EPILOGfrom ...utils.file_ops import guarantee_existence, open_fileRICH_COLOUR_INSTRUCTIONS: str = """diff --git a/manim/cli/plugins/commands.py b/manim/cli/plugins/commands.pyindex 4774a94a0..3d926ca22 100644--- a/manim/cli/plugins/commands.py+++ b/manim/cli/plugins/commands.py@@ -7,9 +7,7 @@ group."""import click-from ...constants import EPILOG-from ...constants import CONTEXT_SETTINGS-+from ...constants import CONTEXT_SETTINGS, EPILOGfrom ...plugins.plugins_flags import list_pluginsdiff --git a/manim/cli/render/commands.py b/manim/cli/render/commands.pyindex 28c0a1d2e..a1d4430e5 100644--- a/manim/cli/render/commands.py+++ b/manim/cli/render/commands.py@@ -12,13 +12,13 @@ from textwrap import dedentimport clickimport cloup+from ... import config, console, logger+from ...constants import CONTEXT_SETTINGS, EPILOG+from ...utils.module_ops import scene_classes_from_filefrom .ease_of_access_options import ease_of_access_optionsfrom .global_options import global_optionsfrom .output_options import output_optionsfrom .render_options import render_options-from ... import config, console, logger-from ...constants import CONTEXT_SETTINGS, EPILOG-from ...utils.module_ops import scene_classes_from_file@cloup.command(diff --git a/manim/cli/render/global_options.py b/manim/cli/render/global_options.pyindex d2b9b70ab..e23f90961 100644--- a/manim/cli/render/global_options.py+++ b/manim/cli/render/global_options.py@@ -1,7 +1,6 @@import clickfrom cloup import option, option_group-global_options = option_group("Global options",option(diff --git a/manim/container.py b/manim/container.pyindex ccacf2ba4..69764216a 100644--- a/manim/container.py+++ b/manim/container.py@@ -8,6 +8,7 @@ __all__ = ["Container"]from abc import ABC, abstractmethod+from . import loggerdiff --git a/manim/grpc/gen/frameserver_pb2_grpc.py b/manim/grpc/gen/frameserver_pb2_grpc.pyindex 43f90f67c..8c380d970 100644--- a/manim/grpc/gen/frameserver_pb2_grpc.py+++ b/manim/grpc/gen/frameserver_pb2_grpc.py@@ -1,8 +1,7 @@# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!"""Client and server classes corresponding to protobuf-defined services."""-import grpc-import frameserver_pb2 as frameserver__pb2+import grpcclass FrameServerStub(object):diff --git a/manim/grpc/gen/renderserver_pb2_grpc.py b/manim/grpc/gen/renderserver_pb2_grpc.pyindex 0a33d9683..38d5818bc 100644--- a/manim/grpc/gen/renderserver_pb2_grpc.py+++ b/manim/grpc/gen/renderserver_pb2_grpc.py@@ -1,7 +1,6 @@# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!"""Client and server classes corresponding to protobuf-defined services."""import grpc-import renderserver_pb2 as renderserver__pb2diff --git a/manim/grpc/impl/frame_server_impl.py b/manim/grpc/impl/frame_server_impl.pyindex 37996e0c3..578d4a4a8 100644--- a/manim/grpc/impl/frame_server_impl.py+++ b/manim/grpc/impl/frame_server_impl.py@@ -1,31 +1,34 @@-from ... import config-from ..gen import frameserver_pb2-from ..gen import frameserver_pb2_grpc-from ..gen import renderserver_pb2-from ..gen import renderserver_pb2_grpc-from concurrent import futures-import grpc+import copy+import logging+import osimport subprocess as spimport threadingimport timeimport traceback-import osimport types+from concurrent import futures++import grpc++from ... import config, logger+from ...constants import WEBGL_RENDERER_INFO+from ...mobject.types.image_mobject import ImageMobject+from ...mobject.types.vectorized_mobject import VMobject+from ...mobject.value_tracker import ValueTracker+from ...renderer.webgl_renderer import WebGLRenderer+from ...utils.family import extract_mobject_family_membersfrom ...utils.module_ops import (get_module,get_scene_classes_from_module,get_scenes_to_render,scene_classes_from_file,)-from ... import logger-from ...constants import WEBGL_RENDERER_INFO-from ...renderer.webgl_renderer import WebGLRenderer-from ...utils.family import extract_mobject_family_members-import logging-import copy-from ...mobject.value_tracker import ValueTracker-from ...mobject.types.vectorized_mobject import VMobject-from ...mobject.types.image_mobject import ImageMobject+from ..gen import (+ frameserver_pb2,+ frameserver_pb2_grpc,+ renderserver_pb2,+ renderserver_pb2_grpc,+)class FrameServer(frameserver_pb2_grpc.FrameServerServicer):diff --git a/manim/mobject/changing.py b/manim/mobject/changing.pyindex 74dd93fd4..b062ed07e 100644--- a/manim/mobject/changing.py+++ b/manim/mobject/changing.py@@ -3,11 +3,10 @@__all__ = ["AnimatedBoundary", "TracedPath"]from ..constants import *-from ..mobject.types.vectorized_mobject import VMobject-from ..mobject.types.vectorized_mobject import VGroup+from ..mobject.types.vectorized_mobject import VGroup, VMobject+from ..utils.color import BLUE_B, BLUE_D, BLUE_E, GREY_BROWN, WHITEfrom ..utils.rate_functions import smoothfrom ..utils.space_ops import get_norm-from ..utils.color import BLUE_D, BLUE_B, BLUE_E, GREY_BROWN, WHITEclass AnimatedBoundary(VGroup):diff --git a/manim/mobject/coordinate_systems.py b/manim/mobject/coordinate_systems.pyindex 4716b0e1b..a99c31748 100644--- a/manim/mobject/coordinate_systems.py+++ b/manim/mobject/coordinate_systems.py@@ -3,22 +3,21 @@__all__ = ["CoordinateSystem", "Axes", "ThreeDAxes", "NumberPlane", "ComplexPlane"]-import numpy as npimport numbers+import numpy as np+from .. import configfrom ..constants import *from ..mobject.functions import ParametricFunction-from ..mobject.geometry import Arrow-from ..mobject.geometry import Line+from ..mobject.geometry import Arrow, Linefrom ..mobject.number_line import NumberLinefrom ..mobject.svg.tex_mobject import MathTexfrom ..mobject.types.vectorized_mobject import VGroup+from ..utils.color import BLUE, BLUE_D, LIGHT_GREY, WHITEfrom ..utils.config_ops import merge_dicts_recursively, update_dict_recursivelyfrom ..utils.simple_functions import binary_searchfrom ..utils.space_ops import angle_of_vector-from ..utils.color import LIGHT_GREY, WHITE, BLUE_D, BLUE-# TODO: There should be much more code reuse between Axes, NumberPlane and GraphScenediff --git a/manim/mobject/functions.py b/manim/mobject/functions.pyindex 0cb08990a..00c9ce46f 100644--- a/manim/mobject/functions.py+++ b/manim/mobject/functions.py@@ -3,13 +3,13 @@__all__ = ["ParametricFunction", "FunctionGraph"]+import math+from .. import configfrom ..constants import *from ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.color import YELLOW-import math-class ParametricFunction(VMobject):"""A parametric curve.diff --git a/manim/mobject/geometry.py b/manim/mobject/geometry.pyindex 36e09b09b..772619bac 100644--- a/manim/mobject/geometry.py+++ b/manim/mobject/geometry.py@@ -59,27 +59,27 @@ __all__ = ["RightAngle",]+import mathimport warnings+import numpy as np-import math+from .. import loggerfrom ..constants import *from ..mobject.mobject import Mobject-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VMobject-from ..mobject.types.vectorized_mobject import DashedVMobject-from ..utils.iterables import adjacent_n_tuples-from ..utils.iterables import adjacent_pairs-from ..utils.simple_functions import fdiv-from ..utils.space_ops import angle_of_vector-from ..utils.space_ops import angle_between_vectors-from ..utils.space_ops import compass_directions-from ..utils.space_ops import line_intersection-from ..utils.space_ops import get_norm-from ..utils.space_ops import normalize-from ..utils.space_ops import rotate_vector+from ..mobject.types.vectorized_mobject import DashedVMobject, VGroup, VMobjectfrom ..utils.color import *-from .. import logger+from ..utils.iterables import adjacent_n_tuples, adjacent_pairs+from ..utils.simple_functions import fdiv+from ..utils.space_ops import (+ angle_between_vectors,+ angle_of_vector,+ compass_directions,+ get_norm,+ line_intersection,+ normalize,+ rotate_vector,+)class TipableVMobject(VMobject):diff --git a/manim/mobject/graph.py b/manim/mobject/graph.pyindex ebacde0c7..ce6c8037b 100644--- a/manim/mobject/graph.py+++ b/manim/mobject/graph.py@@ -4,17 +4,17 @@ __all__ = ["Graph",]-from ..utils.color import BLACK-from .types.vectorized_mobject import VMobject-from .geometry import Dot, Line, LabeledDot-from .svg.tex_mobject import MathTex--from typing import Hashable, Union, List, Tuple-from copy import copy+from typing import Hashable, List, Tuple, Union+import networkx as nximport numpy as np+from ..utils.color import BLACK+from .geometry import Dot, LabeledDot, Line+from .svg.tex_mobject import MathTex+from .types.vectorized_mobject import VMobject+def _determine_graph_layout(nx_graph: nx.classes.graph.Graph,diff --git a/manim/mobject/logo.py b/manim/mobject/logo.pyindex 0112d0393..a23502a48 100644--- a/manim/mobject/logo.py+++ b/manim/mobject/logo.py@@ -4,14 +4,14 @@ __all__ = ["ManimBanner"]import numpy as np-from ..constants import LEFT, UP, RIGHT, DOWN, ORIGIN, TAUfrom ..animation.composition import AnimationGroup, Successionfrom ..animation.fading import FadeInfrom ..animation.transform import ApplyMethod+from ..constants import DOWN, LEFT, ORIGIN, RIGHT, TAU, UPfrom ..mobject.geometry import Circle, Square, Triangle-from ..mobject.value_tracker import ValueTracker-from ..mobject.svg.tex_mobject import Tex, MathTex+from ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroup+from ..mobject.value_tracker import ValueTrackerfrom ..utils.space_ops import normalizefrom ..utils.tex_templates import TexFontTemplatesdiff --git a/manim/mobject/matrix.py b/manim/mobject/matrix.pyindex e80e4cc9c..d92cc3486 100644--- a/manim/mobject/matrix.py+++ b/manim/mobject/matrix.py@@ -39,13 +39,10 @@ __all__ = [import numpy as npfrom ..constants import *-from ..mobject.numbers import DecimalNumber-from ..mobject.numbers import Integer+from ..mobject.numbers import DecimalNumber, Integerfrom ..mobject.shape_matchers import BackgroundRectangle-from ..mobject.svg.tex_mobject import MathTex-from ..mobject.svg.tex_mobject import Tex-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VMobject+from ..mobject.svg.tex_mobject import MathTex, Tex+from ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..utils.color import WHITEVECTOR_LABEL_SCALE_FACTOR = 0.8diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.pyindex e52aa9fb1..e93970311 100644--- a/manim/mobject/mobject.py+++ b/manim/mobject/mobject.py@@ -4,33 +4,40 @@__all__ = ["Mobject", "Group", "override_animate"]-from functools import reduceimport copyimport itertools as itimport operator as opimport randomimport sysimport types-from typing import Callable, List, Optional, Unionimport warnings-+from functools import reducefrom pathlib import Path-from colour import Color+from typing import Callable, List, Optional, Union+import numpy as np+from colour import Colorfrom .. import configfrom ..constants import *from ..container import Container-from ..utils.color import Colors, color_gradient, WHITE, BLACK, YELLOW_C-from ..utils.color import interpolate_color-from ..utils.iterables import list_update-from ..utils.iterables import remove_list_redundancies+from ..utils.color import (+ BLACK,+ WHITE,+ YELLOW_C,+ Colors,+ color_gradient,+ interpolate_color,+)+from ..utils.iterables import list_update, remove_list_redundanciesfrom ..utils.paths import straight_pathfrom ..utils.simple_functions import get_parameters-from ..utils.space_ops import angle_of_vector-from ..utils.space_ops import get_norm-from ..utils.space_ops import rotation_matrix-from ..utils.space_ops import rotation_matrix_transpose+from ..utils.space_ops import (+ angle_of_vector,+ get_norm,+ rotation_matrix,+ rotation_matrix_transpose,+)# TODO: Explain array_attrsdiff --git a/manim/mobject/mobject_update_utils.py b/manim/mobject/mobject_update_utils.pyindex 79f62f766..66c9ad5b0 100644--- a/manim/mobject/mobject_update_utils.py+++ b/manim/mobject/mobject_update_utils.py@@ -13,10 +13,10 @@ __all__ = [import inspect+import numpy as np-from ..constants import DEGREES-from ..constants import RIGHT+from ..constants import DEGREES, RIGHTfrom ..mobject.mobject import Mobjectdiff --git a/manim/mobject/number_line.py b/manim/mobject/number_line.pyindex 23717fcef..7524f1b6c 100644--- a/manim/mobject/number_line.py+++ b/manim/mobject/number_line.py@@ -12,10 +12,10 @@ from ..mobject.geometry import Linefrom ..mobject.numbers import DecimalNumberfrom ..mobject.types.vectorized_mobject import VGroupfrom ..utils.bezier import interpolate+from ..utils.color import LIGHT_GREYfrom ..utils.config_ops import merge_dicts_recursivelyfrom ..utils.simple_functions import fdivfrom ..utils.space_ops import normalize-from ..utils.color import LIGHT_GREYclass NumberLine(Line):diff --git a/manim/mobject/numbers.py b/manim/mobject/numbers.pyindex e7104eff3..a3beb9854 100644--- a/manim/mobject/numbers.py+++ b/manim/mobject/numbers.py@@ -5,11 +5,12 @@ __all__ = ["DecimalNumber", "Integer", "Variable"]import copyimport uuid-from ..utils.family import extract_mobject_family_members+from ..constants import *from ..mobject.svg.tex_mobject import MathTex, SingleStringMathTexfrom ..mobject.types.vectorized_mobject import VMobjectfrom ..mobject.value_tracker import ValueTracker+from ..utils.family import extract_mobject_family_membersclass DecimalNumber(VMobject):diff --git a/manim/mobject/opengl_mobject.py b/manim/mobject/opengl_mobject.pyindex f84ccc682..01b715ea2 100644--- a/manim/mobject/opengl_mobject.py+++ b/manim/mobject/opengl_mobject.py@@ -2,29 +2,29 @@ import copyimport itertools as itimport randomimport sys-import modernglfrom functools import wraps-from ..utils.color import *+import modernglimport numpy as npfrom .. import configfrom ..constants import *+from ..utils.bezier import interpolate+from ..utils.color import *# from ..utils.iterables import batch_by_property-from ..utils.iterables import list_update-from ..utils.iterables import resize_array-from ..utils.iterables import resize_preserving_order-from ..utils.iterables import resize_with_interpolation-from ..utils.iterables import make_even-from ..utils.iterables import listify-from ..utils.iterables import batch_by_property-from ..utils.bezier import interpolate+from ..utils.iterables import (+ batch_by_property,+ list_update,+ listify,+ make_even,+ resize_array,+ resize_preserving_order,+ resize_with_interpolation,+)from ..utils.paths import straight_pathfrom ..utils.simple_functions import get_parameters-from ..utils.space_ops import angle_of_vector-from ..utils.space_ops import get_norm-from ..utils.space_ops import rotation_matrix_transpose+from ..utils.space_ops import angle_of_vector, get_norm, rotation_matrix_transposeclass OpenGLMobject:diff --git a/manim/mobject/opengl_three_dimensions.py b/manim/mobject/opengl_three_dimensions.pyindex a494f759a..53395b7af 100644--- a/manim/mobject/opengl_three_dimensions.py+++ b/manim/mobject/opengl_three_dimensions.py@@ -1,12 +1,9 @@import mathfrom ..constants import *-from ..mobject.types.opengl_surface import OpenGLSurface-from ..mobject.types.opengl_surface import OpenGLSurfaceGroup-from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup-from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject-from ..utils.space_ops import get_norm-from ..utils.space_ops import z_to_vector+from ..mobject.types.opengl_surface import OpenGLSurface, OpenGLSurfaceGroup+from ..mobject.types.opengl_vectorized_mobject import OpenGLVGroup, OpenGLVMobject+from ..utils.space_ops import get_norm, z_to_vectorclass OpenGLSurfaceMesh(OpenGLVGroup):diff --git a/manim/mobject/probability.py b/manim/mobject/probability.pyindex 3c76148d5..e3322dfeb 100644--- a/manim/mobject/probability.py+++ b/manim/mobject/probability.py@@ -4,22 +4,20 @@ __all__ = ["SampleSpace", "BarChart"]from ..constants import *-from ..mobject.geometry import Line-from ..mobject.geometry import Rectangle+from ..mobject.geometry import Line, Rectanglefrom ..mobject.mobject import Mobjectfrom ..mobject.svg.brace import Brace-from ..mobject.svg.tex_mobject import MathTex-from ..mobject.svg.tex_mobject import Tex+from ..mobject.svg.tex_mobject import MathTex, Texfrom ..mobject.types.vectorized_mobject import VGroupfrom ..utils.color import (- color_gradient,+ BLUE,+ BLUE_E,DARK_GREY,- LIGHT_GREY,GREEN_E,- BLUE_E,+ LIGHT_GREY,MAROON_B,YELLOW,- BLUE,+ color_gradient,)from ..utils.iterables import tuplifydiff --git a/manim/mobject/shape_matchers.py b/manim/mobject/shape_matchers.pyindex 08dd14122..633917c80 100644--- a/manim/mobject/shape_matchers.py+++ b/manim/mobject/shape_matchers.py@@ -4,11 +4,9 @@ __all__ = ["SurroundingRectangle", "BackgroundRectangle", "Cross", "Underline"]from ..constants import *-from ..mobject.geometry import Line-from ..mobject.geometry import Rectangle-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VMobject-from ..utils.color import Color, YELLOW, BLACK, RED+from ..mobject.geometry import Line, Rectangle+from ..mobject.types.vectorized_mobject import VGroup, VMobject+from ..utils.color import BLACK, RED, YELLOW, Colorclass SurroundingRectangle(Rectangle):diff --git a/manim/mobject/svg/brace.py b/manim/mobject/svg/brace.pyindex f2b5f10d7..210dc8957 100644--- a/manim/mobject/svg/brace.py+++ b/manim/mobject/svg/brace.py@@ -6,13 +6,12 @@ __all__ = ["Brace", "BraceLabel", "BraceText", "BraceBetweenPoints"]import numpy as npfrom ...animation.composition import AnimationGroup-from ...constants import *from ...animation.fading import FadeInfrom ...animation.growing import GrowFromCenter-from ...mobject.svg.tex_mobject import MathTex-from ...mobject.svg.tex_mobject import Tex-from ...mobject.types.vectorized_mobject import VMobject+from ...constants import *from ...mobject.geometry import Line+from ...mobject.svg.tex_mobject import MathTex, Tex+from ...mobject.types.vectorized_mobject import VMobjectfrom ...utils.space_ops import get_normdiff --git a/manim/mobject/svg/code_mobject.py b/manim/mobject/svg/code_mobject.pyindex 51c026e84..64a753e55 100644--- a/manim/mobject/svg/code_mobject.py+++ b/manim/mobject/svg/code_mobject.py@@ -8,19 +8,18 @@ __all__ = [import htmlimport os-from ...constants import *-from ...mobject.geometry import Dot, RoundedRectangle-from ...mobject.shape_matchers import SurroundingRectangle-from ...mobject.svg.text_mobject import Paragraph-from ...mobject.types.vectorized_mobject import VGroup-from pygments.lexers import guess_lexer_for_filename-import re+from pygments import highlight-from pygments.lexers import get_lexer_by_namefrom pygments.formatters.html import HtmlFormatter+from pygments.lexers import get_lexer_by_name, guess_lexer_for_filenamefrom pygments.styles import get_all_styles+from ...constants import *+from ...mobject.geometry import Dot, RoundedRectangle+from ...mobject.shape_matchers import SurroundingRectangle+from ...mobject.svg.text_mobject import Paragraph+from ...mobject.types.vectorized_mobject import VGroupfrom ...utils.color import WHITEdiff --git a/manim/mobject/svg/style_utils.py b/manim/mobject/svg/style_utils.pyindex 5d25df408..067fec095 100644--- a/manim/mobject/svg/style_utils.py+++ b/manim/mobject/svg/style_utils.py@@ -3,12 +3,12 @@__all__ = ["cascade_element_style", "parse_style", "parse_color_string"]+from typing import Dict, Listfrom xml.dom.minidom import Element as MinidomElement-from colour import web2hex-from ...utils.color import rgb_to_hex-from typing import Dict, List+from colour import web2hex+from ...utils.color import rgb_to_hexCASCADING_STYLING_ATTRIBUTES: List[str] = ["fill",diff --git a/manim/mobject/svg/svg_mobject.py b/manim/mobject/svg/svg_mobject.pyindex 2d431019b..c39aa7c57 100644--- a/manim/mobject/svg/svg_mobject.py+++ b/manim/mobject/svg/svg_mobject.py@@ -5,26 +5,22 @@ __all__ = ["SVGMobject", "string_to_numbers"]import itertools as it-import reimport os+import reimport stringimport warnings--from xml.dom.minidom import Element as MinidomElement, parse as minidom_parse-from typing import Dict, List+from xml.dom.minidom import Element as MinidomElement+from xml.dom.minidom import parse as minidom_parsefrom manim import logger-from .style_utils import cascade_element_style, parse_style-from .svg_path import SVGPathMobject, string_to_numbersfrom ... import configfrom ...constants import *-from ...mobject.geometry import Circle-from ...mobject.geometry import Rectangle-from ...mobject.geometry import RoundedRectangle-from ...mobject.types.vectorized_mobject import VGroup-from ...mobject.types.vectorized_mobject import VMobject+from ...mobject.geometry import Circle, Rectangle, RoundedRectangle+from ...mobject.types.vectorized_mobject import VGroup, VMobject+from .style_utils import cascade_element_style, parse_style+from .svg_path import SVGPathMobject, string_to_numbersclass SVGMobject(VMobject):diff --git a/manim/mobject/svg/svg_path.py b/manim/mobject/svg/svg_path.pyindex 836932d2d..a1d200772 100644--- a/manim/mobject/svg/svg_path.py+++ b/manim/mobject/svg/svg_path.py@@ -5,7 +5,6 @@ __all__ = ["SVGPathMobject", "string_to_numbers", "VMobjectFromSVGPathstring"]import re-from typing import Listfrom manim import loggerdiff --git a/manim/mobject/svg/tex_mobject.py b/manim/mobject/svg/tex_mobject.pyindex e17a2a4cc..b4747b467 100644--- a/manim/mobject/svg/tex_mobject.py+++ b/manim/mobject/svg/tex_mobject.py@@ -168,23 +168,22 @@ __all__ = []-from functools import reduce-import operator as opimport itertools as it+import operator as opimport re+from functools import reduce-from .style_utils import parse_stylefrom ... import config, loggerfrom ...constants import *from ...mobject.geometry import Linefrom ...mobject.svg.svg_mobject import SVGMobjectfrom ...mobject.svg.svg_path import SVGPathMobject-from ...mobject.types.vectorized_mobject import VGroup-from ...mobject.types.vectorized_mobject import VectorizedPoint-from ...utils.strings import split_string_list_to_isolate_substrings-from ...utils.tex_file_writing import tex_to_svg_file+from ...mobject.types.vectorized_mobject import VectorizedPoint, VGroupfrom ...utils.color import BLACK+from ...utils.strings import split_string_list_to_isolate_substringsfrom ...utils.tex import TexTemplate+from ...utils.tex_file_writing import tex_to_svg_file+from .style_utils import parse_styleTEX_MOB_SCALE_FACTOR = 0.05diff --git a/manim/mobject/three_d_utils.py b/manim/mobject/three_d_utils.pyindex ec2ee4d24..9f08110b7 100644--- a/manim/mobject/three_d_utils.py+++ b/manim/mobject/three_d_utils.py@@ -14,10 +14,8 @@ __all__ = [import numpy as np-from ..constants import ORIGIN-from ..constants import UP-from ..utils.space_ops import get_norm-from ..utils.space_ops import get_unit_normal+from ..constants import ORIGIN, UP+from ..utils.space_ops import get_norm, get_unit_normaldef get_3d_vmob_gradient_start_and_end_points(vmob):diff --git a/manim/mobject/three_dimensions.py b/manim/mobject/three_dimensions.pyindex 4625a9610..3eee68237 100644--- a/manim/mobject/three_dimensions.py+++ b/manim/mobject/three_dimensions.py@@ -15,13 +15,12 @@ __all__ = []from ..constants import *-from ..mobject.geometry import Square, Circle, Line+from ..mobject.geometry import Circle, Line, Squarefrom ..mobject.mobject import *-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VMobject-from ..utils.iterables import tuplify-from ..utils.space_ops import z_to_vector, normalize, get_norm+from ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..utils.color import *+from ..utils.iterables import tuplify+from ..utils.space_ops import get_norm, normalize, z_to_vectorclass ThreeDVMobject(VMobject):diff --git a/manim/mobject/types/image_mobject.py b/manim/mobject/types/image_mobject.pyindex 572bff62d..b14a6ce2e 100644--- a/manim/mobject/types/image_mobject.py+++ b/manim/mobject/types/image_mobject.py@@ -3,20 +3,20 @@__all__ = ["AbstractImageMobject", "ImageMobject", "ImageMobjectFromCamera"]import pathlib-import colour+import colourimport numpy as np-from PIL import Image+from manim.constants import DEFAULT_QUALITY, QUALITIES+from ... import configfrom ...constants import *from ...mobject.mobject import Mobjectfrom ...mobject.shape_matchers import SurroundingRectanglefrom ...utils.bezier import interpolate-from ...utils.color import color_to_int_rgb, WHITE+from ...utils.color import WHITE, color_to_int_rgbfrom ...utils.images import get_full_raster_image_path-from manim.constants import QUALITIES, DEFAULT_QUALITYclass AbstractImageMobject(Mobject):diff --git a/manim/mobject/types/opengl_surface.py b/manim/mobject/types/opengl_surface.pyindex 60253f0ef..d8ffd2734 100644--- a/manim/mobject/types/opengl_surface.py+++ b/manim/mobject/types/opengl_surface.py@@ -1,13 +1,12 @@-import numpy as npimport moderngl+import numpy as npfrom ...constants import *from ...mobject.opengl_mobject import OpenGLMobject-from ...utils.bezier import integer_interpolate-from ...utils.bezier import interpolate+from ...utils.bezier import integer_interpolate, interpolate+from ...utils.color import *from ...utils.images import get_full_raster_image_pathfrom ...utils.iterables import listify-from ...utils.color import *from ...utils.space_ops import normalize_along_axisdiff --git a/manim/mobject/types/point_cloud_mobject.py b/manim/mobject/types/point_cloud_mobject.pyindex 59eb803c1..2e413ec53 100644--- a/manim/mobject/types/point_cloud_mobject.py+++ b/manim/mobject/types/point_cloud_mobject.py@@ -6,9 +6,15 @@ __all__ = ["PMobject", "Mobject1D", "Mobject2D", "PGroup", "PointCloudDot", "Poifrom ...constants import *from ...mobject.mobject import Mobjectfrom ...utils.bezier import interpolate-from ...utils.color import color_gradient, YELLOW_C, WHITE, BLACK, YELLOW-from ...utils.color import color_to_rgba-from ...utils.color import rgba_to_color+from ...utils.color import (+ BLACK,+ WHITE,+ YELLOW,+ YELLOW_C,+ color_gradient,+ color_to_rgba,+ rgba_to_color,+)from ...utils.iterables import stretch_array_to_lengthfrom ...utils.space_ops import get_normdiff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.pyindex 4249c24d8..48f00e3ff 100644--- a/manim/mobject/types/vectorized_mobject.py+++ b/manim/mobject/types/vectorized_mobject.py@@ -13,26 +13,24 @@ __all__ = [import itertools as itimport sys-import colourfrom typing import Iterable+import colourfrom ...constants import *from ...mobject.mobject import Mobjectfrom ...mobject.three_d_utils import get_3d_vmob_gradient_start_and_end_points-from ...utils.bezier import bezier-from ...utils.bezier import get_smooth_handle_points-from ...utils.bezier import interpolate-from ...utils.bezier import integer_interpolate-from ...utils.bezier import partial_bezier_points-from ...utils.color import color_to_rgba, BLACK, WHITE-from ...utils.iterables import make_even-from ...utils.iterables import stretch_array_to_length-from ...utils.iterables import tuplify+from ...utils.bezier import (+ bezier,+ get_smooth_handle_points,+ integer_interpolate,+ interpolate,+ partial_bezier_points,+)+from ...utils.color import BLACK, WHITE, color_to_rgba+from ...utils.iterables import make_even, stretch_array_to_length, tuplifyfrom ...utils.simple_functions import clip_in_place-from ...utils.space_ops import rotate_vector-from ...utils.space_ops import get_norm-from ...utils.space_ops import shoelace_direction+from ...utils.space_ops import get_norm, rotate_vector, shoelace_direction# TODO# - Change cubic curve groups to have 4 points instead of 3diff --git a/manim/mobject/value_tracker.py b/manim/mobject/value_tracker.pyindex 8296bf042..e71821e12 100644--- a/manim/mobject/value_tracker.py+++ b/manim/mobject/value_tracker.py@@ -5,8 +5,8 @@ __all__ = ["ValueTracker", "ExponentialValueTracker", "ComplexValueTracker"]import numpy as np-from ..utils.paths import straight_pathfrom ..mobject.mobject import Mobject+from ..utils.paths import straight_pathclass ValueTracker(Mobject):diff --git a/manim/mobject/vector_field.py b/manim/mobject/vector_field.pyindex 2d1c6aa7a..18b5ccc70 100644--- a/manim/mobject/vector_field.py+++ b/manim/mobject/vector_field.py@@ -13,29 +13,35 @@ __all__ = ["move_points_along_vector_field",]+import itertools as it+import os+import randomfrom typing import Callableimport numpy as np-import os-import itertools as itfrom PIL import Image-import randomfrom .. import config, logger-from ..constants import *from ..animation.composition import AnimationGroupfrom ..animation.indication import ShowPassingFlash+from ..constants import *from ..mobject.geometry import Vector-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VMobject-from ..utils.bezier import inverse_interpolate-from ..utils.bezier import interpolate-from ..utils.color import color_to_rgb, BLUE_E, GREEN, YELLOW, RED, BLUE, WHITE-from ..utils.color import rgb_to_color+from ..mobject.mobject import Mobject+from ..mobject.types.vectorized_mobject import VGroup, VMobject+from ..utils.bezier import interpolate, inverse_interpolate+from ..utils.color import (+ BLUE,+ BLUE_E,+ GREEN,+ RED,+ WHITE,+ YELLOW,+ color_to_rgb,+ rgb_to_color,+)from ..utils.rate_functions import linearfrom ..utils.simple_functions import sigmoidfrom ..utils.space_ops import get_norm-from ..mobject.mobject import Mobject# from ..utils.space_ops import normalizediff --git a/manim/opengl/__init__.py b/manim/opengl/__init__.pyindex 09f2aadd8..00298e0b6 100644--- a/manim/opengl/__init__.py+++ b/manim/opengl/__init__.py@@ -1,5 +1,5 @@-from ..mobject.opengl_mobject import *-from ..mobject.types.opengl_vectorized_mobject import *from ..mobject.opengl_geometry import *-from ..mobject.types.opengl_surface import *+from ..mobject.opengl_mobject import *from ..mobject.opengl_three_dimensions import *+from ..mobject.types.opengl_surface import *+from ..mobject.types.opengl_vectorized_mobject import *diff --git a/manim/plugins/plugins_flags.py b/manim/plugins/plugins_flags.pyindex 0101b631a..887ecee8b 100644--- a/manim/plugins/plugins_flags.py+++ b/manim/plugins/plugins_flags.py@@ -6,6 +6,7 @@ Plugin Managing Utility."""import pathlib+import pkg_resourcesfrom manim import consolediff --git a/manim/renderer/cairo_renderer.py b/manim/renderer/cairo_renderer.pyindex 372f34301..03f5e8e01 100644--- a/manim/renderer/cairo_renderer.py+++ b/manim/renderer/cairo_renderer.py@@ -1,15 +1,16 @@-import typingimport time+import typing+import numpy as npfrom manim.utils.hashing import get_hash_from_play_callfrom .. import config, loggerfrom ..camera.camera import Camera+from ..mobject.mobject import Mobjectfrom ..scene.scene_file_writer import SceneFileWriterfrom ..utils.exceptions import EndSceneEarlyExceptionfrom ..utils.iterables import list_update-from ..mobject.mobject import Mobjectdef handle_play_like_call(func):diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.pyindex 8b4690d34..b6387baa6 100644--- a/manim/renderer/opengl_renderer.py+++ b/manim/renderer/opengl_renderer.py@@ -1,33 +1,35 @@-from manim.utils.exceptions import EndSceneEarlyException-from manim.utils.caching import handle_caching_play-from manim.renderer.cairo_renderer import handle_play_like_call-from manim.utils.color import color_to_rgba-import moderngl-from .opengl_renderer_window import Window-from .shader_wrapper import ShaderWrapper-import numpy as np-from ..mobject.types.vectorized_mobject import VMobjectimport itertools as itimport time++import moderngl+import numpy as np+from PIL import Image++from manim import config+from manim.renderer.cairo_renderer import handle_play_like_call+from manim.utils.caching import handle_caching_play+from manim.utils.color import color_to_rgba+from manim.utils.exceptions import EndSceneEarlyException+from .. import loggerfrom ..constants import *+from ..mobject import opengl_geometry+from ..mobject.opengl_mobject import OpenGLMobject, OpenGLPoint+from ..mobject.types.vectorized_mobject import VMobject+from ..scene.scene_file_writer import SceneFileWriter+from ..utils.simple_functions import clipfrom ..utils.space_ops import (+ angle_of_vector,cross2d,earclip_triangulation,- z_to_vector,- quaternion_mult,quaternion_from_angle_axis,- rotation_matrix_transpose_from_quaternion,+ quaternion_mult,rotation_matrix_transpose,- angle_of_vector,+ rotation_matrix_transpose_from_quaternion,+ z_to_vector,)-from ..utils.simple_functions import clip--from ..mobject import opengl_geometry-from ..mobject.opengl_mobject import OpenGLMobject, OpenGLPoint-from PIL import Image-from manim import config-from ..scene.scene_file_writer import SceneFileWriter+from .opengl_renderer_window import Window+from .shader_wrapper import ShaderWrapperclass OpenGLCamera(OpenGLMobject):diff --git a/manim/renderer/opengl_renderer_window.py b/manim/renderer/opengl_renderer_window.pyindex 8ad828588..707704a43 100644--- a/manim/renderer/opengl_renderer_window.py+++ b/manim/renderer/opengl_renderer_window.py@@ -1,8 +1,9 @@-from .. import config, __version__import moderngl_window as mglwfrom moderngl_window.context.pyglet.window import Window as PygletWindowfrom moderngl_window.timers.clock import Timer+from .. import __version__, config+class Window(PygletWindow):fullscreen = Falsediff --git a/manim/renderer/shader_wrapper.py b/manim/renderer/shader_wrapper.pyindex 57a8d4e1d..208bcd97e 100644--- a/manim/renderer/shader_wrapper.py+++ b/manim/renderer/shader_wrapper.py@@ -1,10 +1,12 @@+import copyimport osimport re+from pathlib import Path+import modernglimport numpy as np-import copy+from .. import logger-from pathlib import Path# from manimlib.utils.directories import get_shader_dir# from manimlib.utils.file_ops import find_filediff --git a/manim/renderer/webgl_renderer.py b/manim/renderer/webgl_renderer.pyindex 7f42f0b86..3b1b6ef3b 100644--- a/manim/renderer/webgl_renderer.py+++ b/manim/renderer/webgl_renderer.py@@ -1,7 +1,9 @@import copy-from ..utils.family import extract_mobject_family_members+from manim import config+from ..utils.family import extract_mobject_family_members+class WebGLRenderer:def __init__(self, frame_server):diff --git a/manim/scene/graph_scene.py b/manim/scene/graph_scene.pyindex b3b8ad528..e00395a79 100644--- a/manim/scene/graph_scene.py+++ b/manim/scene/graph_scene.py@@ -49,23 +49,27 @@ __all__ = ["GraphScene"]import itertools as itfrom .. import config-from ..animation.creation import Write, DrawBorderThenFill, Create+from ..animation.creation import Create, DrawBorderThenFill, Writefrom ..animation.transform import Transformfrom ..animation.update import UpdateFromAlphaFuncfrom ..constants import *from ..mobject.functions import ParametricFunction-from ..mobject.geometry import Line-from ..mobject.geometry import Rectangle-from ..mobject.geometry import RegularPolygon+from ..mobject.geometry import Line, Rectangle, RegularPolygonfrom ..mobject.number_line import NumberLine-from ..mobject.svg.tex_mobject import MathTex-from ..mobject.svg.tex_mobject import Tex-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VectorizedPoint+from ..mobject.svg.tex_mobject import MathTex, Tex+from ..mobject.types.vectorized_mobject import VectorizedPoint, VGroupfrom ..scene.scene import Scenefrom ..utils.bezier import interpolate-from ..utils.color import color_gradient, GREY, BLUE, GREEN, YELLOW, BLACK, WHITE-from ..utils.color import invert_color+from ..utils.color import (+ BLACK,+ BLUE,+ GREEN,+ GREY,+ WHITE,+ YELLOW,+ color_gradient,+ invert_color,+)from ..utils.space_ops import angle_of_vector# TODO, this should probably reimplemented entirely, especially so as todiff --git a/manim/scene/moving_camera_scene.py b/manim/scene/moving_camera_scene.pyindex 0fb6e84e3..09d41105e 100644--- a/manim/scene/moving_camera_scene.py+++ b/manim/scene/moving_camera_scene.py@@ -74,8 +74,8 @@ __all__ = ["MovingCameraScene"]from ..camera.moving_camera import MovingCamerafrom ..scene.scene import Scene-from ..utils.iterables import list_updatefrom ..utils.family import extract_mobject_family_members+from ..utils.iterables import list_updateclass MovingCameraScene(Scene):diff --git a/manim/scene/sample_space_scene.py b/manim/scene/sample_space_scene.pyindex 3636847db..6a689529c 100644--- a/manim/scene/sample_space_scene.py+++ b/manim/scene/sample_space_scene.py@@ -4,13 +4,12 @@ __all__ = ["SampleSpaceScene"]from ..animation.animation import Animation-from ..animation.transform import MoveToTarget-from ..animation.transform import Transform+from ..animation.transform import MoveToTarget, Transformfrom ..animation.update import UpdateFromFuncfrom ..constants import *-from ..scene.scene import Scenefrom ..mobject.probability import SampleSpacefrom ..mobject.types.vectorized_mobject import VGroup+from ..scene.scene import Sceneclass SampleSpaceScene(Scene):diff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex 001f2aaae..30e976964 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -4,16 +4,16 @@__all__ = ["Scene"]+import copyimport inspect-import random-import warningsimport platform-import copy+import randomimport stringimport types+import warnings-from tqdm import tqdmimport numpy as np+from tqdm import tqdmfrom .. import config, loggerfrom ..animation.animation import Animation, Wait, prepare_animation@@ -23,12 +23,12 @@ from ..constants import *from ..container import Containerfrom ..mobject.mobject import Mobject, _AnimationBuilderfrom ..mobject.opengl_mobject import OpenGLPoint-from ..utils.iterables import list_update, list_difference_update-from ..utils.family import extract_mobject_family_membersfrom ..renderer.cairo_renderer import CairoRendererfrom ..utils.exceptions import EndSceneEarlyException+from ..utils.family import extract_mobject_family_membersfrom ..utils.family_ops import restructure_list_to_exclude_certain_family_membersfrom ..utils.file_ops import open_media_file+from ..utils.iterables import list_difference_update, list_updatefrom ..utils.space_ops import rotate_vectordiff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.pyindex 9bc2cc319..803b7b804 100644--- a/manim/scene/scene_file_writer.py+++ b/manim/scene/scene_file_writer.py@@ -3,22 +3,27 @@__all__ = ["SceneFileWriter"]-import numpy as np-from pydub import AudioSegment+import datetime+import osimport shutilimport subprocess-import os+from pathlib import Pathfrom time import sleep-import datetime++import numpy as npfrom PIL import Image-from pathlib import Path+from pydub import AudioSegmentfrom manim import __version__+from .. import config, loggerfrom ..constants import FFMPEG_BIN, GIF_FILE_EXTENSION-from ..utils.file_ops import guarantee_existence-from ..utils.file_ops import add_extension_if_not_present, add_version_before_extension-from ..utils.file_ops import modify_atime+from ..utils.file_ops import (+ add_extension_if_not_present,+ add_version_before_extension,+ guarantee_existence,+ modify_atime,+)from ..utils.sounds import get_full_sound_file_pathdiff --git a/manim/scene/three_d_scene.py b/manim/scene/three_d_scene.pyindex 2ecd58204..0e7091d73 100644--- a/manim/scene/three_d_scene.py+++ b/manim/scene/three_d_scene.py@@ -3,6 +3,8 @@__all__ = ["ThreeDScene", "SpecialThreeDScene"]+import numpy as np+from .. import configfrom ..animation.transform import ApplyMethodfrom ..camera.three_d_camera import ThreeDCamera@@ -10,12 +12,10 @@ from ..constants import DEGREESfrom ..mobject.coordinate_systems import ThreeDAxesfrom ..mobject.geometry import Linefrom ..mobject.three_dimensions import Sphere-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VectorizedPoint+from ..mobject.types.vectorized_mobject import VectorizedPoint, VGroupfrom ..mobject.value_tracker import ValueTrackerfrom ..scene.scene import Scenefrom ..utils.config_ops import merge_dicts_recursively-import numpy as npclass ThreeDScene(Scene):diff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.pyindex 7b560578e..99d381cd9 100644--- a/manim/scene/vector_space_scene.py+++ b/manim/scene/vector_space_scene.py@@ -6,36 +6,22 @@ __all__ = ["VectorScene", "LinearTransformationScene"]import numpy as npfrom .. import config-from ..constants import *from ..animation.animation import Animation-from ..animation.creation import Create-from ..animation.creation import Write+from ..animation.creation import Create, Writefrom ..animation.fading import FadeOutfrom ..animation.growing import GrowArrow-from ..animation.transform import ApplyFunction-from ..animation.transform import ApplyPointwiseFunction-from ..animation.transform import Transform-from ..mobject.coordinate_systems import Axes-from ..mobject.coordinate_systems import NumberPlane-from ..mobject.geometry import Arrow-from ..mobject.geometry import Dot-from ..mobject.geometry import Line-from ..mobject.geometry import Rectangle-from ..mobject.geometry import Vector-from ..mobject.matrix import Matrix-from ..mobject.matrix import VECTOR_LABEL_SCALE_FACTOR-from ..mobject.matrix import vector_coordinate_label+from ..animation.transform import ApplyFunction, ApplyPointwiseFunction, Transform+from ..constants import *+from ..mobject.coordinate_systems import Axes, NumberPlane+from ..mobject.geometry import Arrow, Dot, Line, Rectangle, Vector+from ..mobject.matrix import VECTOR_LABEL_SCALE_FACTOR, Matrix, vector_coordinate_labelfrom ..mobject.mobject import Mobject-from ..mobject.svg.tex_mobject import MathTex-from ..mobject.svg.tex_mobject import Tex-from ..mobject.types.vectorized_mobject import VGroup-from ..mobject.types.vectorized_mobject import VMobject+from ..mobject.svg.tex_mobject import MathTex, Tex+from ..mobject.types.vectorized_mobject import VGroup, VMobjectfrom ..scene.scene import Scene-from ..utils.color import GREEN_C, RED_C, BLUE_D, WHITE, YELLOW, GREY, LIGHT_GREY-from ..utils.rate_functions import rush_from-from ..utils.rate_functions import rush_into-from ..utils.space_ops import angle_of_vector-from ..utils.space_ops import get_norm+from ..utils.color import BLUE_D, GREEN_C, GREY, LIGHT_GREY, RED_C, WHITE, YELLOW+from ..utils.rate_functions import rush_from, rush_into+from ..utils.space_ops import angle_of_vector, get_normX_COLOR = GREEN_CY_COLOR = RED_Cdiff --git a/manim/utils/bezier.py b/manim/utils/bezier.pyindex bceb92fe7..28d87e848 100644--- a/manim/utils/bezier.py+++ b/manim/utils/bezier.py@@ -22,8 +22,7 @@ import numpy as npfrom scipy import linalgfrom ..utils.simple_functions import choose-from ..utils.space_ops import cross2d-from ..utils.space_ops import find_intersection+from ..utils.space_ops import cross2d, find_intersectionCLOSED_THRESHOLD: float = 0.001diff --git a/manim/utils/color.py b/manim/utils/color.pyindex cbd749453..bb18977b4 100644--- a/manim/utils/color.py+++ b/manim/utils/color.py@@ -89,11 +89,11 @@ __all__ = ["ORANGE",]-from enum import Enumimport random+from enum import Enum-from colour import Colorimport numpy as np+from colour import Colorfrom ..utils.bezier import interpolatefrom ..utils.simple_functions import clip_in_placediff --git a/manim/utils/debug.py b/manim/utils/debug.pyindex 4820003fc..a2b6d114d 100644--- a/manim/utils/debug.py+++ b/manim/utils/debug.py@@ -4,10 +4,11 @@__all__ = ["print_family", "index_labels", "get_submobject_index_labels"]-from .color import BLACK+import logging+from ..mobject.numbers import Integerfrom ..mobject.types.vectorized_mobject import VGroup-import logging+from .color import BLACKdef print_family(mobject, n_tabs=0):diff --git a/manim/utils/file_ops.py b/manim/utils/file_ops.pyindex 1d71038c4..de907e295 100644--- a/manim/utils/file_ops.py+++ b/manim/utils/file_ops.py@@ -11,12 +11,11 @@ __all__ = [import osimport platform-import timeimport subprocess as sp-from manim import config, logger+import timefrom pathlib import Path-from manim import __version__+from manim import __version__, config, loggerdef add_extension_if_not_present(file_name, extension):diff --git a/manim/utils/hashing.py b/manim/utils/hashing.pyindex e0571c779..39c84712f 100644--- a/manim/utils/hashing.py+++ b/manim/utils/hashing.py@@ -1,12 +1,13 @@"""Utilities for scene caching."""+import copy+import inspectimport jsonimport zlib-import inspect-import copy-import numpy as np-from types import ModuleType, MappingProxyType, FunctionType, MethodTypefrom time import perf_counter+from types import FunctionType, MappingProxyType, MethodType, ModuleType++import numpy as npfrom .. import loggerdiff --git a/manim/utils/images.py b/manim/utils/images.pyindex 3a36b442a..5fd049c45 100644--- a/manim/utils/images.py+++ b/manim/utils/images.py@@ -4,10 +4,9 @@ __all__ = ["get_full_raster_image_path", "drag_pixels", "invert_image"]import numpy as np--from .. import configfrom PIL import Image+from .. import configfrom ..utils.file_ops import seek_full_path_from_defaultsdiff --git a/manim/utils/ipython_magic.py b/manim/utils/ipython_magic.pyindex db910dd63..8d1927f2c 100644--- a/manim/utils/ipython_magic.py+++ b/manim/utils/ipython_magic.py@@ -13,11 +13,11 @@ try:from IPython import get_ipythonfrom IPython.core.magic import (Magics,- magics_class,line_cell_magic,+ magics_class,needs_local_scope,)- from IPython.display import display, Image, Video+ from IPython.display import Image, Video, displayexcept ImportError:passelse:diff --git a/manim/utils/iterables.py b/manim/utils/iterables.pyindex 2e0d95ca2..bd6fc59d9 100644--- a/manim/utils/iterables.py+++ b/manim/utils/iterables.py@@ -18,6 +18,7 @@ __all__ = [import itertools as it+import numpy as npdiff --git a/manim/utils/module_ops.py b/manim/utils/module_ops.pyindex 8e5c68569..5de1d83df 100644--- a/manim/utils/module_ops.py+++ b/manim/utils/module_ops.py@@ -1,12 +1,13 @@-from .. import constants, logger, console, configimport importlib.utilimport inspectimport os-from pathlib import Path+import reimport sysimport types-import reimport warnings+from pathlib import Path++from .. import config, console, constants, loggerdef get_module(file_name: Path):diff --git a/manim/utils/paths.py b/manim/utils/paths.pyindex addaa84b9..092b7d2ea 100644--- a/manim/utils/paths.py+++ b/manim/utils/paths.py@@ -12,8 +12,7 @@ import numpy as npfrom ..constants import OUTfrom ..utils.bezier import interpolate-from ..utils.space_ops import get_norm-from ..utils.space_ops import rotation_matrix+from ..utils.space_ops import get_norm, rotation_matrixSTRAIGHT_PATH_THRESHOLD = 0.01diff --git a/manim/utils/simple_functions.py b/manim/utils/simple_functions.pyindex 79a1f122b..108a05361 100644--- a/manim/utils/simple_functions.py+++ b/manim/utils/simple_functions.py@@ -12,10 +12,11 @@ __all__ = []-from functools import reduceimport inspect-import numpy as npimport operator as op+from functools import reduce++import numpy as npdef sigmoid(x):diff --git a/manim/utils/space_ops.py b/manim/utils/space_ops.pyindex 68d9f2409..2d0d807e7 100644--- a/manim/utils/space_ops.py+++ b/manim/utils/space_ops.py@@ -32,21 +32,17 @@ __all__ = []+import itertools as it+import mathfrom functools import reduceimport numpy as np-import mathfrom mapbox_earcut import triangulate_float32 as earcut-from ..constants import OUT-from ..constants import PI-from ..constants import RIGHT-from ..constants import TAU-from ..constants import DOWN+from .. import config+from ..constants import DOWN, OUT, PI, RIGHT, TAUfrom ..utils.iterables import adjacent_pairsfrom ..utils.simple_functions import fdiv-import itertools as it-from .. import configdef get_norm(vect):diff --git a/manim/utils/tex_file_writing.py b/manim/utils/tex_file_writing.pyindex d78f05a43..24b152ef4 100644--- a/manim/utils/tex_file_writing.py+++ b/manim/utils/tex_file_writing.py@@ -6,8 +6,8 @@"""-import osimport hashlib+import osfrom pathlib import Pathfrom .. import config, loggerdiff --git a/manim/utils/tex_templates.py b/manim/utils/tex_templates.pyindex 14071db06..2bc6479a2 100644--- a/manim/utils/tex_templates.py+++ b/manim/utils/tex_templates.py@@ -7,7 +7,6 @@ __all__ = [from .tex import *-# This file makes TexTemplateLibrary and TexFontTemplates available for use in manim Tex and MathTex objects.diff --git a/manim/utils/unit.py b/manim/utils/unit.pyindex 00f54e70d..f620b1433 100644--- a/manim/utils/unit.py+++ b/manim/utils/unit.py@@ -2,8 +2,7 @@import numpy as np-from .. import constants, config-+from .. import config, constants__all__ = ["Pixels", "Degrees", "Munits", "Percent"]diff --git a/poetry.lock b/poetry.lockindex 15c478139..0b0bb81f9 100644--- a/poetry.lock+++ b/poetry.lock@@ -158,14 +158,6 @@ packaging = "*"six = ">=1.9.0"webencodings = "*"-[[package]]-name = "certifi"-version = "2020.12.5"-description = "Python package for providing Mozilla's CA Bundle."-category = "main"-optional = false-python-versions = "*"-[[package]]name = "cffi"version = "1.14.5"@@ -185,14 +177,6 @@ category = "dev"optional = falsepython-versions = ">=3.6.1"-[[package]]-name = "chardet"-version = "4.0.0"-description = "Universal encoding detector for Python 2 and 3"-category = "main"-optional = false-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"-[[package]]name = "click"version = "7.1.2"@@ -251,7 +235,7 @@ optional = falsepython-versions = "*"[package.extras]-test = ["flake8 (3.7.8)", "hypothesis (3.55.3)"]+test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"][[package]]name = "contextvars"@@ -542,11 +526,11 @@ license = ["editdistance-s"][[package]]name = "idna"-version = "2.10"+version = "3.1"description = "Internationalized Domain Names in Applications (IDNA)"category = "main"-optional = false-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"+optional = true+python-versions = ">=3.4"[[package]]name = "imagesize"@@ -688,7 +672,7 @@ python-versions = ">=3.6"parso = ">=0.8.0,<0.9.0"[package.extras]-qa = ["flake8 (3.8.3)", "mypy (0.782)"]+qa = ["flake8 (==3.8.3)", "mypy (==0.782)"]testing = ["Django (<3.1)", "colorama", "docopt", "pytest (<6.0.0)"][[package]]@@ -879,7 +863,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"[[package]]name = "manimpango"-version = "0.2.4"+version = "0.2.5.post0"description = "Bindings for Pango for using with Manim."category = "main"optional = false@@ -966,7 +950,7 @@ pyrr = ">=0.10.3,<1"pysdl2 = ["pysdl2"]pyside2 = ["PySide2 (<6)"]glfw = ["glfw"]-pygame = ["pygame (2.0.0.dev10)"]+pygame = ["pygame (==2.0.0.dev10)"]pyqt5 = ["pyqt5"]pywavefront = ["pywavefront (>=1.2.0,<2)"]tk = ["pyopengltk (>=0.0.3)"]@@ -1050,11 +1034,11 @@ testpath = "*"traitlets = ">=4.2"[package.extras]-all = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (0.2.2)", "tornado (>=4.0)", "sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"]+all = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (==0.2.2)", "tornado (>=4.0)", "sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"]docs = ["sphinx (>=1.5.1)", "sphinx-rtd-theme", "nbsphinx (>=0.2.12)", "ipython"]serve = ["tornado (>=4.0)"]-test = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (0.2.2)"]-webpdf = ["pyppeteer (0.2.2)"]+test = ["pytest", "pytest-cov", "pytest-dependency", "ipykernel", "ipywidgets (>=7)", "pyppeteer (==0.2.2)"]+webpdf = ["pyppeteer (==0.2.2)"][[package]]name = "nbformat"@@ -1179,7 +1163,7 @@ optional = truepython-versions = ">=3.6"[package.extras]-qa = ["flake8 (3.8.3)", "mypy (0.782)"]+qa = ["flake8 (==3.8.3)", "mypy (==0.782)"]testing = ["docopt", "pytest (<6.0.0)"][[package]]@@ -1251,11 +1235,11 @@ virtualenv = ">=20.0.8"[[package]]name = "prometheus-client"-version = "0.9.0"+version = "0.10.0"description = "Python client for the Prometheus monitoring system."category = "main"optional = true-python-versions = "*"+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"[package.extras]twisted = ["twisted"]@@ -1410,7 +1394,7 @@ mccabe = ">=0.6,<0.7"toml = ">=0.7.1"[package.extras]-docs = ["sphinx (3.5.1)", "python-docs-theme (2020.12)"]+docs = ["sphinx (==3.5.1)", "python-docs-theme (==2020.12)"][[package]]name = "pyparsing"@@ -1475,7 +1459,7 @@ coverage = ">=5.2.1"pytest = ">=4.6"[package.extras]-testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"]+testing = ["fields", "hunter", "process-tests (==2.0.2)", "six", "pytest-xdist", "virtualenv"][[package]]name = "python-dateutil"@@ -1555,21 +1539,15 @@ python-versions = "*"[[package]]name = "requests"-version = "2.25.1"+version = "2.15.1"description = "Python HTTP for Humans."category = "main"optional = false-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"--[package.dependencies]-certifi = ">=2017.4.17"-chardet = ">=3.0.2,<5"-idna = ">=2.5,<3"-urllib3 = ">=1.21.1,<1.27"+python-versions = "*"[package.extras]-security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]-socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]+security = ["cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0.14)"]+socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"][[package]]name = "restructuredtext-lint"@@ -1844,19 +1822,6 @@ category = "main"optional = falsepython-versions = "*"-[[package]]-name = "urllib3"-version = "1.26.4"-description = "HTTP library with thread-safe connection pooling, file post, and more."-category = "main"-optional = false-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"--[package.extras]-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]-socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]-brotli = ["brotlipy (>=0.6.0)"]-[[package]]name = "virtualenv"version = "20.4.3"@@ -1931,7 +1896,7 @@ webgl_renderer = ["grpcio", "grpcio-tools", "watchdog"][metadata]lock-version = "1.1"python-versions = "^3.6.2"-content-hash = "83c1367b90b92e2ae9c1a403f5c4393ad14306264855837c855f24550c9e2e09"+content-hash = "ee48c8ca5d2457050df258223cc4d997dedba1ee65ca9f6c66a4c0fb90ab5673"[metadata.files]alabaster = [@@ -2001,10 +1966,6 @@ bleach = [{file = "bleach-3.3.0-py2.py3-none-any.whl", hash = "sha256:6123ddc1052673e52bab52cdc955bcb57a015264a1c57d37bea2f6b817af0125"},{file = "bleach-3.3.0.tar.gz", hash = "sha256:98b3170739e5e83dd9dc19633f074727ad848cbedb6026708c8ac2d3b697a433"},]-certifi = [- {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},- {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"},-]cffi = [{file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"},{file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"},@@ -2048,10 +2009,6 @@ cfgv = [{file = "cfgv-3.2.0-py2.py3-none-any.whl", hash = "sha256:32e43d604bbe7896fe7c248a9c2276447dbef840feb28fe20494f62af110211d"},{file = "cfgv-3.2.0.tar.gz", hash = "sha256:cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"},]-chardet = [- {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},- {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},-]click = [{file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"},{file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"},@@ -2340,8 +2297,8 @@ identify = [{file = "identify-2.2.2.tar.gz", hash = "sha256:43cb1965e84cdd247e875dec6d13332ef5be355ddc16776396d98089b9053d87"},]idna = [- {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},- {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},+ {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"},+ {file = "idna-3.1.tar.gz", hash = "sha256:c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"},]imagesize = [{file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"},@@ -2495,19 +2452,19 @@ lazy-object-proxy = [{file = "lazy_object_proxy-1.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:f5144c75445ae3ca2057faac03fda5a902eff196702b0a24daf1d6ce0650514b"},]manimpango = [- {file = "ManimPango-0.2.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:129a7271b47480032b24e54d943a049217c60b59a98971c4c98463d10ed15d86"},- {file = "ManimPango-0.2.4-cp36-cp36m-win32.whl", hash = "sha256:e771d8aaa55a765a50a13bd011e819acb3404b47f038e6a3e26b6cf27f2f9bd9"},- {file = "ManimPango-0.2.4-cp36-cp36m-win_amd64.whl", hash = "sha256:a5207fa32d7e6e13c5efd0885d9a746ec54cf1e30e09f370112c8737ef17b3ab"},- {file = "ManimPango-0.2.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3cc665a00678fc56cab8456ec5b6756dd6c57bb2713ff9a2f906a13e62ea903d"},- {file = "ManimPango-0.2.4-cp37-cp37m-win32.whl", hash = "sha256:1df688c89b9b2971baffd7a8f843e9dd4496bbf86f7e2e8afcb17a7c61a421e0"},- {file = "ManimPango-0.2.4-cp37-cp37m-win_amd64.whl", hash = "sha256:39ed1d97ab8ec801e86d332dfbec4193841333ad0cac8f8ffefa93f81330739f"},- {file = "ManimPango-0.2.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:080579aa1be0a3bfd2f964830de164873571cea4e9fc15a833ce607d99dce839"},- {file = "ManimPango-0.2.4-cp38-cp38-win32.whl", hash = "sha256:0bf6d46cedd2ce3555f48b562f261f16b889d080b237e41e60a534a2317ba1bb"},- {file = "ManimPango-0.2.4-cp38-cp38-win_amd64.whl", hash = "sha256:15bcad75f631106129deaee8d59cea476a76af376614e6b02e65c5da002f90d5"},- {file = "ManimPango-0.2.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6331bf527348de168203b772fb3f495986b4894bb9585a2a58801b4e3db65a8e"},- {file = "ManimPango-0.2.4-cp39-cp39-win32.whl", hash = "sha256:8e8a9aab9997c8ffff7aa72ceb2a49f299aa7cbb0712e67ec3a7b6cbe1b79156"},- {file = "ManimPango-0.2.4-cp39-cp39-win_amd64.whl", hash = "sha256:a04a8b9d4e9b7a1d4b103016ae54d791557d935096a73347a4bfd7553542bce9"},- {file = "ManimPango-0.2.4.tar.gz", hash = "sha256:309ac6ee56dbdb85599b1ad61b30ea78a800ab12a4db1264dddcad41681de38c"},+ {file = "ManimPango-0.2.5.post0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:53f754594ccedeaf464028777d4502fb31f2251b9dca7e99b40786b3e4ff394d"},+ {file = "ManimPango-0.2.5.post0-cp36-cp36m-win32.whl", hash = "sha256:ac33cc00a89aabe7459043b7aab8851e4ec4c7fa78cea2b3dacb618b2b03c98b"},+ {file = "ManimPango-0.2.5.post0-cp36-cp36m-win_amd64.whl", hash = "sha256:87e205f5a35ff5504104cd30b8d086e9f97c17f95cf490de7cc1d4aa8c2a8425"},+ {file = "ManimPango-0.2.5.post0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:70e59f888ca5ad0be37777f761cee8fb3d6e28c5d949e5da13f727326b46da60"},+ {file = "ManimPango-0.2.5.post0-cp37-cp37m-win32.whl", hash = "sha256:d9cc5ac80dd363fd4f3fa233f7fad74e9749965b6e4af10a2174f946fe1d9813"},+ {file = "ManimPango-0.2.5.post0-cp37-cp37m-win_amd64.whl", hash = "sha256:3bef549783fc5e3f39598880e7cc41bb44dc2e37ceb8c7e20f0381fd8d67b3e8"},+ {file = "ManimPango-0.2.5.post0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:978bcf4c6cf145f723ec551ed18a1959f6952f100d61c7b4431939ee850f9308"},+ {file = "ManimPango-0.2.5.post0-cp38-cp38-win32.whl", hash = "sha256:db877a3a037739ce2f647f747bc750c7e9a881ce5175a4ad764170f24fb2d68a"},+ {file = "ManimPango-0.2.5.post0-cp38-cp38-win_amd64.whl", hash = "sha256:2876c64724a73893ba22c250ddf603724865c650a925ddca76102eea0e489373"},+ {file = "ManimPango-0.2.5.post0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e3694ae99ef758a8eaf847f77b0fa2bf7318ed2ee55a32b3a3bb155dd2d6ec9b"},+ {file = "ManimPango-0.2.5.post0-cp39-cp39-win32.whl", hash = "sha256:139469a6130270e3cf94c4b01fa9b17dc516170a11b901ff0ce0f6cdff6752e9"},+ {file = "ManimPango-0.2.5.post0-cp39-cp39-win_amd64.whl", hash = "sha256:aad57df6ec62585f52c662b84f2d5ff2c686daa8ca753326b6cde8b798c4da96"},+ {file = "ManimPango-0.2.5.post0.tar.gz", hash = "sha256:c33d073d4389ad93bbac13029b8a0da5d8ee0b8fe7f282379ff95012e34d324e"},]mapbox-earcut = [{file = "mapbox_earcut-0.12.10-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:2aaf7bdb002d36d38d1412088329a9176de3fcadc24a53951b76e49a27e34d78"},@@ -2570,20 +2527,39 @@ markupsafe = [{file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"},{file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"},{file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"},+ {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d53bc011414228441014aa71dbec320c66468c1030aae3a6e29778a3382d96e5"},{file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"},{file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"},+ {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3b8a6499709d29c2e2399569d96719a1b21dcd94410a586a18526b143ec8470f"},+ {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:84dee80c15f1b560d55bcfe6d47b27d070b4681c699c572af2e3c7cc90a3b8e0"},+ {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:b1dba4527182c95a0db8b6060cc98ac49b9e2f5e64320e2b56e47cb2831978c7"},{file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"},{file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"},{file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"},+ {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bf5aa3cbcfdf57fa2ee9cd1822c862ef23037f5c832ad09cfea57fa846dec193"},{file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"},{file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"},+ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:6fffc775d90dcc9aed1b89219549b329a9250d918fd0b8fa8d93d154918422e1"},+ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:a6a744282b7718a2a62d2ed9d993cad6f5f585605ad352c11de459f4108df0a1"},+ {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:195d7d2c4fbb0ee8139a6cf67194f3973a6b3042d742ebe0a9ed36d8b6f0c07f"},{file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"},{file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"},{file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"},{file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"},{file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"},+ {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:acf08ac40292838b3cbbb06cfe9b2cb9ec78fce8baca31ddb87aaac2e2dc3bc2"},+ {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:d9be0ba6c527163cbed5e0857c451fcd092ce83947944d6c14bc95441203f032"},+ {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:caabedc8323f1e93231b52fc32bdcde6db817623d33e100708d9a68e1f53b26b"},{file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"},{file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d73a845f227b0bfe8a7455ee623525ee656a9e2e749e4742706d80a6065d5e2c"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:98bae9582248d6cf62321dcb52aaf5d9adf0bad3b40582925ef7c7f0ed85fceb"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:2beec1e0de6924ea551859edb9e7679da6e4870d32cb766240ce17e0a0ba2014"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:7fed13866cf14bba33e7176717346713881f56d9d2bcebab207f7a036f41b850"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:6f1e273a344928347c1290119b493a1f0303c52f5a5eae5f16d74f48c15d4a85"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:feb7b34d6325451ef96bc0e36e1a6c0c1c64bc1fbec4b854f4529e51887b1621"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-win32.whl", hash = "sha256:22c178a091fc6630d0d045bdb5992d2dfe14e3259760e713c490da5323866c39"},+ {file = "MarkupSafe-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:b7d644ddb4dbd407d31ffb699f1d140bc35478da613b441c582aeb7c43838dd8"},{file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"},]matplotlib = [@@ -2794,8 +2770,8 @@ pre-commit = [{file = "pre_commit-2.11.1.tar.gz", hash = "sha256:de55c5c72ce80d79106e48beb1b54104d16495ce7f95b0c7b13d4784193a00af"},]prometheus-client = [- {file = "prometheus_client-0.9.0-py2.py3-none-any.whl", hash = "sha256:b08c34c328e1bf5961f0b4352668e6c8f145b4a087e09b7296ef62cbe4693d35"},- {file = "prometheus_client-0.9.0.tar.gz", hash = "sha256:9da7b32f02439d8c04f7777021c304ed51d9ec180604700c1ba72a4d44dceb03"},+ {file = "prometheus_client-0.10.0-py2.py3-none-any.whl", hash = "sha256:c5843b3e1b4689a3599a2463e5b5850d110d1a7e28a94bdc2c6f5bb6585cfb18"},+ {file = "prometheus_client-0.10.0.tar.gz", hash = "sha256:1e7bc14fd6ca9c3fc07309b73a7a3469920dfe88ca9f331c02258cc62736cbc2"},]prompt-toolkit = [{file = "prompt_toolkit-3.0.18-py3-none-any.whl", hash = "sha256:bf00f22079f5fadc949f42ae8ff7f05702826a97059ffcc6281036ad40ac6f04"},@@ -3046,8 +3022,8 @@ regex = [{file = "regex-2021.3.17.tar.gz", hash = "sha256:4b8a1fb724904139149a43e172850f35aa6ea97fb0545244dc0b805e0154ed68"},]requests = [- {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"},- {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},+ {file = "requests-2.15.1-py2.py3-none-any.whl", hash = "sha256:ff753b2196cd18b1bbeddc9dcd5c864056599f7a7d9a4fb5677e723efa2b7fb9"},+ {file = "requests-2.15.1.tar.gz", hash = "sha256:e5659b9315a0610505e050bb7190bf6fa2ccee1ac295f2b760ef9d8a03ebbb2e"},]restructuredtext-lint = [{file = "restructuredtext_lint-1.3.2.tar.gz", hash = "sha256:d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80"},@@ -3231,10 +3207,6 @@ typing-extensions = [{file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"},{file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"},]-urllib3 = [- {file = "urllib3-1.26.4-py2.py3-none-any.whl", hash = "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df"},- {file = "urllib3-1.26.4.tar.gz", hash = "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"},-]virtualenv = [{file = "virtualenv-20.4.3-py2.py3-none-any.whl", hash = "sha256:83f95875d382c7abafe06bd2a4cdd1b363e1bb77e02f155ebe8ac082a916b37c"},{file = "virtualenv-20.4.3.tar.gz", hash = "sha256:49ec4eb4c224c6f7dd81bb6d0a28a09ecae5894f4e593c89b0db0885f565a107"},diff --git a/pyproject.toml b/pyproject.tomlindex bc39722ce..48c3d1eb9 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -72,6 +72,7 @@ flake8-pytest-style = "^1.4.0"flake8-logging-format = "^0.6.0"flake8-rst-docstrings = "^0.0.14"flake8-docstrings = "^1.6.0"+isort = "^5.8.0"[tool.poetry.dev-dependencies.black]version = "^20.8b1"@@ -83,6 +84,15 @@ markers = "platform_python_implementation == 'CPython'"markers = "slow: Mark the test as slow. Can be skipped with --skip_slow"addopts = "--cov=manim --cov-report xml --cov-report term"+[tool.isort]+# from https://black.readthedocs.io/en/stable/compatible_configs.html+multi_line_output = 3+include_trailing_comma = true+force_grid_wrap = 0+use_parentheses = true+ensure_newline_before_comments = true+line_length = 88+[tool.coverage.run]omit = ["*tests*"]diff --git a/scripts/dev_changelog.py b/scripts/dev_changelog.pyindex 3633b7920..f319bd0fa 100755--- a/scripts/dev_changelog.py+++ b/scripts/dev_changelog.py@@ -45,16 +45,16 @@ This script was taken from Numpy under the terms of BSD-3-Clause license.import datetimeimport re-import click--from manim.constants import EPILOG, CONTEXT_SETTINGSfrom collections import defaultdict-from textwrap import dedent, indentfrom pathlib import Path-from tqdm import tqdm+from textwrap import dedent, indent++import clickfrom git import Repofrom github import Github+from tqdm import tqdm+from manim.constants import CONTEXT_SETTINGS, EPILOGthis_repo = Repo(str(Path(__file__).resolve().parent.parent))diff --git a/scripts/make_and_open_docs.py b/scripts/make_and_open_docs.pyindex 9baf51d00..c24b73d9d 100644--- a/scripts/make_and_open_docs.py+++ b/scripts/make_and_open_docs.py@@ -1,7 +1,7 @@-from pathlib import Pathimport osimport sysimport webbrowser+from pathlib import Pathpath_makefile = Path(__file__).parents[1] / "docs"os.system(f"cd {path_makefile} && make html")diff --git a/scripts/simple_cors_http_server.py b/scripts/simple_cors_http_server.pyindex 2f3034193..2038f95a6 100755--- a/scripts/simple_cors_http_server.py+++ b/scripts/simple_cors_http_server.py@@ -1,6 +1,6 @@#!/usr/bin/env python3-from http.server import HTTPServer, SimpleHTTPRequestHandler, testimport sys+from http.server import HTTPServer, SimpleHTTPRequestHandler, testclass CORSRequestHandler(SimpleHTTPRequestHandler):diff --git a/scripts/template_twitter_post.py b/scripts/template_twitter_post.pyindex bfb542583..210135de9 100644--- a/scripts/template_twitter_post.py+++ b/scripts/template_twitter_post.py@@ -1,6 +1,7 @@-from manim import *import pkg_resources+from manim import *+version_num = pkg_resources.get_distribution("manim").versiondiff --git a/tests/conftest.py b/tests/conftest.pyindex fc6826576..7638f4134 100644--- a/tests/conftest.py+++ b/tests/conftest.py@@ -1,9 +1,11 @@-from manim import config-import pytest-import numpy as np+import loggingimport osimport sys-import logging++import numpy as np+import pytest++from manim import configdef pytest_addoption(parser):diff --git a/tests/helpers/graphical_units.py b/tests/helpers/graphical_units.pyindex 47e7c6859..6815fd2f0 100644--- a/tests/helpers/graphical_units.py+++ b/tests/helpers/graphical_units.py@@ -3,6 +3,7 @@import osimport tempfile+import numpy as npfrom manim import config, loggerdiff --git a/tests/helpers/video_utils.py b/tests/helpers/video_utils.pyindex 13ee05850..1e115e45d 100644--- a/tests/helpers/video_utils.py+++ b/tests/helpers/video_utils.py@@ -1,8 +1,8 @@"""Helpers for dev to set up new tests that use videos."""+import jsonimport osimport subprocess-import jsonfrom manim import loggerdiff --git a/tests/test_animate.py b/tests/test_animate.pyindex a2bea0e38..d0f348471 100644--- a/tests/test_animate.py+++ b/tests/test_animate.py@@ -1,10 +1,10 @@import numpy as npimport pytest+from manim.animation.creation import Uncreate+from manim.mobject.geometry import Dot, Line, Squarefrom manim.mobject.mobject import override_animatefrom manim.mobject.types.vectorized_mobject import VGroup-from manim.mobject.geometry import Dot, Line, Square-from manim.animation.creation import Uncreatedef test_simple_animate():diff --git a/tests/test_axes_shift.py b/tests/test_axes_shift.pyindex 194e92df1..6cf996e37 100644--- a/tests/test_axes_shift.py+++ b/tests/test_axes_shift.py@@ -1,5 +1,5 @@-import pytestimport numpy as np+import pytestfrom manim.scene.graph_scene import GraphScenediff --git a/tests/test_color.py b/tests/test_color.pyindex 8e793f0aa..073c90d57 100644--- a/tests/test_color.py+++ b/tests/test_color.py@@ -1,7 +1,7 @@-import pytestimport numpy as np+import pytest-from manim import Mobject, VMobject, Camera, Scene, tempconfig, config, WHITE, BLACK+from manim import BLACK, WHITE, Camera, Mobject, Scene, VMobject, config, tempconfigdef test_import_color():diff --git a/tests/test_commands.py b/tests/test_commands.pyindex e53f3b67a..7095c6a59 100644--- a/tests/test_commands.py+++ b/tests/test_commands.py@@ -1,9 +1,12 @@import sys+from textwrap import dedent++from click.testing import CliRunner+from manim import __version__from manim.__main__ import main-from click.testing import CliRunner+from .utils.video_tester import *-from textwrap import dedentdef test_manim_version():diff --git a/tests/test_composition.py b/tests/test_composition.pyindex 0e6e7781e..900bc0ac2 100644--- a/tests/test_composition.py+++ b/tests/test_composition.py@@ -2,7 +2,7 @@ from manim.animation.animation import Animation, Waitfrom manim.animation.composition import AnimationGroup, Successionfrom manim.animation.fading import FadeIn, FadeInFrom, FadeOutAndShiftfrom manim.constants import DOWN-from manim.mobject.geometry import Line, Square, Circle+from manim.mobject.geometry import Circle, Line, Squaredef test_succession_timing():diff --git a/tests/test_config.py b/tests/test_config.pyindex 14877e693..bd60072d4 100644--- a/tests/test_config.py+++ b/tests/test_config.py@@ -1,8 +1,9 @@import tempfilefrom pathlib import Path+import numpy as np-from manim import config, tempconfig, Scene, Square, WHITE+from manim import WHITE, Scene, Square, config, tempconfigdef test_tempconfig():diff --git a/tests/test_container.py b/tests/test_container.pyindex 579ccf32f..d88534ad0 100644--- a/tests/test_container.py+++ b/tests/test_container.py@@ -1,4 +1,5 @@import pytest+from manim import Container, Mobject, Scene, tempconfigdiff --git a/tests/test_coordinate_system.py b/tests/test_coordinate_system.pyindex c575db31b..5205af33c 100644--- a/tests/test_coordinate_system.py+++ b/tests/test_coordinate_system.py@@ -1,8 +1,9 @@-import pytestimport numpy as np+import pytest++from manim import LEFT, ORIGIN, Axes, ComplexPlanefrom manim import CoordinateSystem as CS-from manim import Axes, ThreeDAxes, NumberPlane, ComplexPlane-from manim import config, tempconfig, ORIGIN, LEFT+from manim import NumberPlane, ThreeDAxes, config, tempconfigdef test_initial_config():diff --git a/tests/test_copy.py b/tests/test_copy.pyindex 4edd5e00a..c2b78cbee 100644--- a/tests/test_copy.py+++ b/tests/test_copy.py@@ -1,5 +1,6 @@from pathlib import Path-from manim import Mobject, BraceLabel, config++from manim import BraceLabel, Mobject, configdef test_mobject_copy():diff --git a/tests/test_family.py b/tests/test_family.pyindex 47744cbb4..c528fdf4d 100644--- a/tests/test_family.py+++ b/tests/test_family.py@@ -1,5 +1,6 @@import numpy as np-from manim import Mobject, Circle, RIGHT++from manim import RIGHT, Circle, Mobjectdef test_family():diff --git a/tests/test_get_set.py b/tests/test_get_set.pyindex e74af412e..202efa3ca 100644--- a/tests/test_get_set.py+++ b/tests/test_get_set.py@@ -1,4 +1,5 @@import types+import pytestfrom manim.mobject.mobject import Mobjectdiff --git a/tests/test_graphical_units/test_axes.py b/tests/test_graphical_units/test_axes.pyindex f3d1f8f41..02e0bf670 100644--- a/tests/test_graphical_units/test_axes.py+++ b/tests/test_graphical_units/test_axes.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass AxesTest(GraphScene):diff --git a/tests/test_graphical_units/test_coordinate_systems.py b/tests/test_graphical_units/test_coordinate_systems.pyindex f6ab08eb2..e4fb80b9f 100644--- a/tests/test_graphical_units/test_coordinate_systems.py+++ b/tests/test_graphical_units/test_coordinate_systems.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass NumberPlaneTest(Scene):diff --git a/tests/test_graphical_units/test_creation.py b/tests/test_graphical_units/test_creation.pyindex d2c8dcd26..eacfe6bc1 100644--- a/tests/test_graphical_units/test_creation.py+++ b/tests/test_graphical_units/test_creation.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass CreateTest(Scene):diff --git a/tests/test_graphical_units/test_functions.py b/tests/test_graphical_units/test_functions.pyindex b5db37c79..1b77a61bf 100644--- a/tests/test_graphical_units/test_functions.py+++ b/tests/test_graphical_units/test_functions.py@@ -1,9 +1,10 @@-import pytestimport numpy as np+import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass FunctionGraphTest(Scene):diff --git a/tests/test_graphical_units/test_geometry.py b/tests/test_graphical_units/test_geometry.pyindex bfb509f2f..6f9afa58d 100644--- a/tests/test_graphical_units/test_geometry.py+++ b/tests/test_graphical_units/test_geometry.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass CoordinatesTest(Scene):diff --git a/tests/test_graphical_units/test_graphscene.py b/tests/test_graphical_units/test_graphscene.pyindex a09a33ac4..9fab06082 100644--- a/tests/test_graphical_units/test_graphscene.py+++ b/tests/test_graphical_units/test_graphscene.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass PlotFunctions(GraphScene):diff --git a/tests/test_graphical_units/test_img_and_svg.py b/tests/test_graphical_units/test_img_and_svg.pyindex 42c107eb9..2dd0be372 100644--- a/tests/test_graphical_units/test_img_and_svg.py+++ b/tests/test_graphical_units/test_img_and_svg.py@@ -2,12 +2,13 @@ import sysfrom pathlib import Pathimport pytest+from manim import *-from ..helpers.path_utils import get_project_root-from ..utils.testing_utils import get_scenes_to_test-from ..utils.GraphicalUnitTester import GraphicalUnitTesterfrom ..helpers.graphical_units import set_test_scene+from ..helpers.path_utils import get_project_root+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testdef get_test_resource(filename):diff --git a/tests/test_graphical_units/test_indication.py b/tests/test_graphical_units/test_indication.pyindex 28d3d6498..43ca9b7a0 100644--- a/tests/test_graphical_units/test_indication.py+++ b/tests/test_graphical_units/test_indication.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass FocusOnTest(Scene):diff --git a/tests/test_graphical_units/test_mobjects.py b/tests/test_graphical_units/test_mobjects.pyindex 17f23d739..5d7137cfd 100644--- a/tests/test_graphical_units/test_mobjects.py+++ b/tests/test_graphical_units/test_mobjects.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass PointCloudDotTest(ThreeDScene):diff --git a/tests/test_graphical_units/test_modifier_methods.py b/tests/test_graphical_units/test_modifier_methods.pyindex e998a9293..f212af374 100644--- a/tests/test_graphical_units/test_modifier_methods.py+++ b/tests/test_graphical_units/test_modifier_methods.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass GradientTest(Scene):diff --git a/tests/test_graphical_units/test_movements.py b/tests/test_graphical_units/test_movements.pyindex 163ca2152..d6b67d876 100644--- a/tests/test_graphical_units/test_movements.py+++ b/tests/test_graphical_units/test_movements.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass HomotopyTest(Scene):diff --git a/tests/test_graphical_units/test_opengl.py b/tests/test_graphical_units/test_opengl.pyindex 362e3e2d0..4d49af5f9 100644--- a/tests/test_graphical_units/test_opengl.py+++ b/tests/test_graphical_units/test_opengl.py@@ -2,8 +2,9 @@ import pytestfrom manim import *from manim.opengl import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass CircleTest(Scene):diff --git a/tests/test_graphical_units/test_threed.py b/tests/test_graphical_units/test_threed.pyindex 1cd883c2b..c1ebb68db 100644--- a/tests/test_graphical_units/test_threed.py+++ b/tests/test_graphical_units/test_threed.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass CubeTest(ThreeDScene):diff --git a/tests/test_graphical_units/test_transform.py b/tests/test_graphical_units/test_transform.pyindex 2e058d975..6df8fa1bc 100644--- a/tests/test_graphical_units/test_transform.py+++ b/tests/test_graphical_units/test_transform.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass TransformTest(Scene):diff --git a/tests/test_graphical_units/test_updaters.py b/tests/test_graphical_units/test_updaters.pyindex 1afdfb892..57e46c24d 100644--- a/tests/test_graphical_units/test_updaters.py+++ b/tests/test_graphical_units/test_updaters.py@@ -1,8 +1,9 @@import pytestfrom manim import *-from ..utils.testing_utils import get_scenes_to_test+from ..utils.GraphicalUnitTester import GraphicalUnitTester+from ..utils.testing_utils import get_scenes_to_testclass UpdaterTest(Scene):diff --git a/tests/test_hashing.py b/tests/test_hashing.pyindex 2a839dd20..1200fda6d 100644--- a/tests/test_hashing.py+++ b/tests/test_hashing.py@@ -1,7 +1,7 @@-import manim.utils.hashing as hashing-import json+import manim.utils.hashing as hashing+def test_JSON_basic():o = {"test": 1, 2: 4, 3: 2.0}diff --git a/tests/test_markup.py b/tests/test_markup.pyindex 33c5d78b4..779966675 100644--- a/tests/test_markup.py+++ b/tests/test_markup.py@@ -1,4 +1,5 @@import pytest+from manim import MarkupTextdiff --git a/tests/test_scene_rendering/conftest.py b/tests/test_scene_rendering/conftest.pyindex 7d82f193d..7aff314e5 100644--- a/tests/test_scene_rendering/conftest.py+++ b/tests/test_scene_rendering/conftest.py@@ -1,7 +1,7 @@-import pytest-from pathlib import Path+import pytest+from manim import config, tempconfigdiff --git a/tests/test_scene_rendering/test_caching_related.py b/tests/test_scene_rendering/test_caching_related.pyindex 27b72f3ef..daa4c34bd 100644--- a/tests/test_scene_rendering/test_caching_related.py+++ b/tests/test_scene_rendering/test_caching_related.py@@ -1,8 +1,9 @@import os-import pytestimport subprocessimport sys+import pytest+from ..utils.commands import capturefrom ..utils.video_tester import *diff --git a/tests/test_scene_rendering/test_cli_flags.py b/tests/test_scene_rendering/test_cli_flags.pyindex 0c92b61e1..b5cdac8c8 100644--- a/tests/test_scene_rendering/test_cli_flags.py+++ b/tests/test_scene_rendering/test_cli_flags.py@@ -1,13 +1,15 @@-import pytestimport sys+from pathlib import Path+import numpy as np+import pytest+from click.testing import CliRunnerfrom PIL import Image-from pathlib import Path+from manim.__main__ import main-from click.testing import CliRunner+from manim.utils.file_ops import add_version_before_extensionfrom ..utils.video_tester import *-from manim.utils.file_ops import add_version_before_extension@pytest.mark.slowdiff --git a/tests/test_scene_rendering/test_play_logic.py b/tests/test_scene_rendering/test_play_logic.pyindex d5a678933..a116b46cf 100644--- a/tests/test_scene_rendering/test_play_logic.py+++ b/tests/test_scene_rendering/test_play_logic.py@@ -1,10 +1,11 @@+import sysfrom functools import wrapsfrom pathlib import Pathfrom unittest.mock import Mock-from numpy.core.defchararray import asarray-import sysimport pytest+from numpy.core.defchararray import asarray+from manim import *from manim import configdiff --git a/tests/test_sound.py b/tests/test_sound.pyindex d7614eca6..ace4c4362 100644--- a/tests/test_sound.py+++ b/tests/test_sound.py@@ -1,4 +1,6 @@-import os, struct, wave+import os+import struct+import wavefrom manim import Scenediff --git a/tests/test_stroke.py b/tests/test_stroke.pyindex 2fb7337ed..678dd707c 100644--- a/tests/test_stroke.py+++ b/tests/test_stroke.py@@ -1,5 +1,5 @@-from manim import VMobjectimport manim.utils.color as C+from manim import VMobjectdef test_stroke_props_in_ctor():diff --git a/tests/test_unit_geometry.py b/tests/test_unit_geometry.pyindex da2e78410..b15ff2e88 100644--- a/tests/test_unit_geometry.py+++ b/tests/test_unit_geometry.py@@ -1,5 +1,6 @@-import pytestimport numpy as np+import pytest+from manim import Sectordiff --git a/tests/test_units.py b/tests/test_units.pyindex 7fe8c3c9d..9c1222bcb 100644--- a/tests/test_units.py+++ b/tests/test_units.py@@ -1,7 +1,8 @@-import pytest-from manim import config, X_AXIS, Y_AXIS, Z_AXIS, PI-from manim.utils.unit import Pixels, Degrees, Munits, Percentimport numpy as np+import pytest++from manim import PI, X_AXIS, Y_AXIS, Z_AXIS, config+from manim.utils.unit import Degrees, Munits, Percent, Pixelsdef test_units():diff --git a/tests/test_vectorized_mobject.py b/tests/test_vectorized_mobject.pyindex 8ae78ab81..f8f9e1e93 100644--- a/tests/test_vectorized_mobject.py+++ b/tests/test_vectorized_mobject.py@@ -1,5 +1,6 @@import pytest-from manim import Mobject, VMobject, VGroup, VDict++from manim import Mobject, VDict, VGroup, VMobjectdef test_vgroup_init():diff --git a/tests/test_version.py b/tests/test_version.pyindex 2a06e7185..476c08659 100644--- a/tests/test_version.py+++ b/tests/test_version.py@@ -1,6 +1,7 @@-from manim import __name__, __version__import pkg_resources+from manim import __name__, __version__+def test_version():assert __version__ == pkg_resources.get_distribution(__name__).versiondiff --git a/tests/utils/GraphicalUnitTester.py b/tests/utils/GraphicalUnitTester.pyindex b4cdad99a..2a9b8a865 100644--- a/tests/utils/GraphicalUnitTester.py+++ b/tests/utils/GraphicalUnitTester.py@@ -1,5 +1,6 @@-import osimport logging+import os+import numpy as npfrom manim import config, tempconfig@@ -82,8 +83,8 @@ class GraphicalUnitTester:def _show_diff_helper(self, frame_data, expected_frame_data):"""Will visually display with matplotlib differences between frame generated and the one expected."""- import matplotlib.pyplot as pltimport matplotlib.gridspec as gridspec+ import matplotlib.pyplot as pltgs = gridspec.GridSpec(2, 2)fig = plt.figure()diff --git a/tests/utils/logging_tester.py b/tests/utils/logging_tester.pyindex 70c0cf5ba..980e00853 100644--- a/tests/utils/logging_tester.py+++ b/tests/utils/logging_tester.py@@ -1,7 +1,7 @@-from functools import wraps-import os-import jsonimport itertools+import json+import os+from functools import wrapsdef _check_logs(reference_logfile, generated_logfile):diff --git a/tests/utils/testing_utils.py b/tests/utils/testing_utils.pyindex cd3514e0e..7bd97609b 100644--- a/tests/utils/testing_utils.py+++ b/tests/utils/testing_utils.py@@ -1,5 +1,5 @@-import sysimport inspect+import sysdef get_scenes_to_test(module_name):diff --git a/tests/utils/video_tester.py b/tests/utils/video_tester.pyindex 6978e551b..0f0e6e8c8 100644--- a/tests/utils/video_tester.py+++ b/tests/utils/video_tester.py@@ -1,7 +1,7 @@-import subprocessimport json-from functools import wrapsimport os+import subprocess+from functools import wrapsfrom ..utils.commands import capture