A community-maintained Python framework for creating mathematical animations.
Create config subpackage (#376)
Leo Torres9845998bec03
diff --git a/manim/__init__.py b/manim/__init__.pyindex 6227c2688..dd1bf9c7e 100644--- a/manim/__init__.py+++ b/manim/__init__.py@@ -1,11 +1,8 @@#!/usr/bin/env python# Importing the config module should be the first thing we do, since other-# modules depend on the global config dict for initialization. Note that the-# global config dict is called 'config', just like the module itself. That's-# why we import the module first with a different name, and then the dict.-from . import config as _config-from .config import config, file_writer_config, camera_config, tempconfig+# modules depend on the global config dict for initialization.+from .config import *from .constants import *diff --git a/manim/__main__.py b/manim/__main__.pyindex 4f0275865..14d524e06 100644--- a/manim/__main__.py+++ b/manim/__main__.py@@ -8,14 +8,12 @@ import tracebackimport importlib.utilimport types-from .config import file_writer_config, args-from .utils import cfg_subcmds+from . import constants, logger, console, file_writer_config+from .config.config import args+from .config import cfg_subcmdsfrom .scene.scene import Scene-from .utils.sounds import play_error_sound-from .utils.sounds import play_finish_sound+from .utils.sounds import play_error_sound, play_finish_soundfrom .utils.file_ops import open_file as open_media_file-from . import constants-from .logger import logger, consoledef open_file_if_needed(file_writer):diff --git a/manim/animation/fading.py b/manim/animation/fading.pyindex 362f01f31..1e485435c 100644--- a/manim/animation/fading.py+++ b/manim/animation/fading.py@@ -23,7 +23,7 @@ from ..constants import DOWNfrom ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.bezier import interpolatefrom ..utils.rate_functions import there_and_back-from ..logger import logger+from .. import loggerDEFAULT_FADE_LAG_RATIO = 0diff --git a/manim/animation/indication.py b/manim/animation/indication.pyindex 1cf3e1bfb..2e1b03e14 100644--- a/manim/animation/indication.py+++ b/manim/animation/indication.py@@ -18,8 +18,8 @@ __all__ = [import numpy as np+from .. import configfrom ..constants import *-from ..config import configfrom ..animation.animation import Animationfrom ..animation.movement import Homotopyfrom ..animation.composition import AnimationGroupdiff --git a/manim/camera/camera.py b/manim/camera/camera.pyindex 75bf48c2f..2a5fbb419 100644--- a/manim/camera/camera.py+++ b/manim/camera/camera.py@@ -15,9 +15,8 @@ from scipy.spatial.distance import pdistimport cairoimport numpy as np+from .. import logger, config, camera_configfrom ..constants import *-from ..config import config, camera_config-from ..logger import loggerfrom ..mobject.types.image_mobject import AbstractImageMobjectfrom ..mobject.mobject import Mobjectfrom ..mobject.types.point_cloud_mobject import PMobjectdiff --git a/manim/camera/moving_camera.py b/manim/camera/moving_camera.pyindex 53bdadaa9..56304064f 100644--- a/manim/camera/moving_camera.py+++ b/manim/camera/moving_camera.py@@ -1,8 +1,8 @@__all__ = ["CameraFrame", "MovingCamera"]+from .. import configfrom ..camera.camera import Camera-from ..config import configfrom ..constants import ORIGIN, WHITEfrom ..mobject.frame import ScreenRectanglefrom ..mobject.types.vectorized_mobject import VGroupdiff --git a/manim/camera/three_d_camera.py b/manim/camera/three_d_camera.pyindex c5dd12c60..b6ea00313 100644--- a/manim/camera/three_d_camera.py+++ b/manim/camera/three_d_camera.py@@ -3,9 +3,9 @@ __all__ = ["ThreeDCamera"]import numpy as np+from .. import configfrom ..camera.camera import Camerafrom ..constants import *-from ..config import configfrom ..mobject.three_d_utils import get_3d_vmob_end_cornerfrom ..mobject.three_d_utils import get_3d_vmob_end_corner_unit_normalfrom ..mobject.three_d_utils import get_3d_vmob_start_cornerdiff --git a/manim/config/__init__.py b/manim/config/__init__.pynew file mode 100644index 000000000..2711c21b0--- /dev/null+++ b/manim/config/__init__.py@@ -0,0 +1,9 @@+# Note that the global config dict is called 'config', just like the module+# itself. That's why we import the module first with a different name+# (_config), and then the dict.+from . import config as _config+from .config import config, tempconfig, file_writer_config, camera_config+from .logger import logger, console++__all__ = ["_config", "config", "tempconfig", "file_writer_config",+ "camera_config", "logger", "console"]diff --git a/manim/utils/cfg_subcmds.py b/manim/config/cfg_subcmds.pysimilarity index 99%rename from manim/utils/cfg_subcmds.pyrename to manim/config/cfg_subcmds.pyindex 4f23e5dae..f5e457f14 100644--- a/manim/utils/cfg_subcmds.py+++ b/manim/config/cfg_subcmds.py@@ -11,7 +11,7 @@ import configparserfrom ast import literal_evalfrom .config_utils import _run_config, _paths_config_file, finalized_configs_dict-from .file_ops import guarantee_existence, open_file+from ..utils.file_ops import guarantee_existence, open_filefrom rich.console import Consolefrom rich.style import Stylediff --git a/manim/config.py b/manim/config/config.pysimilarity index 97%rename from manim/config.pyrename to manim/config/config.pyindex 0e314af12..c1f0936e5 100644--- a/manim/config.py+++ b/manim/config/config.py@@ -4,19 +4,22 @@ config.pyProcess the manim.cfg file and the command line arguments into a singleconfig object."""+++__all__ = ["file_writer_config", "config", "camera_config", "tempconfig"]++import osimport sysfrom contextlib import contextmanagerimport colour-from . import constants-from .utils.config_utils import _run_config, _init_dirs, _from_command_line+from .. import constants+from .config_utils import _run_config, _init_dirs, _from_command_linefrom .logger import logger-from .utils.tex import TexTemplate, TexTemplateFromFile--__all__ = ["file_writer_config", "config", "camera_config", "tempconfig"]+from ..utils.tex import TexTemplate, TexTemplateFromFileconfig = Nonediff --git a/manim/utils/config_utils.py b/manim/config/config_utils.pysimilarity index 99%rename from manim/utils/config_utils.pyrename to manim/config/config_utils.pyindex 7a1e1d562..37b265032 100644--- a/manim/utils/config_utils.py+++ b/manim/config/config_utils.py@@ -6,6 +6,15 @@ Utility functions for parsing manim config files."""++__all__ = [+ "_run_config",+ "_paths_config_file",+ "_from_command_line",+ "finalized_configs_dict",+]++import argparseimport configparserimport os@@ -14,14 +23,7 @@ import sysimport colourfrom .. import constants-from .tex import TexTemplate, TexTemplateFromFile--__all__ = [- "_run_config",- "_paths_config_file",- "_from_command_line",- "finalized_configs_dict",-]+from ..utils.tex import TexTemplate, TexTemplateFromFiledef _parse_file_writer_config(config_parser, args):@@ -459,7 +461,7 @@ def _from_dunder_main():def _paths_config_file():library_wide = os.path.abspath(- os.path.join(os.path.dirname(__file__), "..", "default.cfg")+ os.path.join(os.path.dirname(__file__), "default.cfg"))if sys.platform.startswith("win32"):user_wide = os.path.expanduser(diff --git a/manim/default.cfg b/manim/config/default.cfgsimilarity index 100%rename from manim/default.cfgrename to manim/config/default.cfgdiff --git a/manim/logger.py b/manim/config/logger.pysimilarity index 97%rename from manim/logger.pyrename to manim/config/logger.pyindex 7974a22e7..143509b34 100644--- a/manim/logger.py+++ b/manim/config/logger.py@@ -5,6 +5,11 @@ This is the logging library for manim.This library uses rich for coloured log outputs."""+++__all__ = ['logger', 'console']++import configparserimport logging@@ -14,7 +19,7 @@ from rich.theme import Themefrom rich import print as printffrom rich import errors, color-from .utils.config_utils import _run_config+from .config_utils import _run_configdef parse_theme(fp):diff --git a/manim/mobject/coordinate_systems.py b/manim/mobject/coordinate_systems.pyindex e3c89d365..0bed1d4c2 100644--- a/manim/mobject/coordinate_systems.py+++ b/manim/mobject/coordinate_systems.py@@ -4,8 +4,8 @@ __all__ = ["CoordinateSystem", "Axes", "ThreeDAxes", "NumberPlane", "ComplexPlanimport numpy as npimport numbers+from .. import configfrom ..constants import *-from ..config import configfrom ..mobject.functions import ParametricFunctionfrom ..mobject.geometry import Arrowfrom ..mobject.geometry import Linediff --git a/manim/mobject/frame.py b/manim/mobject/frame.pyindex d2a8ccd0c..489b38573 100644--- a/manim/mobject/frame.py+++ b/manim/mobject/frame.py@@ -6,8 +6,8 @@ __all__ = []+from .. import configfrom ..constants import *-from ..config import configfrom ..mobject.geometry import Rectanglefrom ..utils.config_ops import digest_configdiff --git a/manim/mobject/functions.py b/manim/mobject/functions.pyindex 68a5ebbee..902966ce4 100644--- a/manim/mobject/functions.py+++ b/manim/mobject/functions.py@@ -1,8 +1,8 @@__all__ = ["ParametricFunction", "FunctionGraph"]+from .. import configfrom ..constants import *-from ..config import configfrom ..mobject.types.vectorized_mobject import VMobjectfrom ..utils.config_ops import digest_configimport mathdiff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.pyindex 5bd1ded62..20cb3125d 100644--- a/manim/mobject/mobject.py+++ b/manim/mobject/mobject.py@@ -15,8 +15,8 @@ import sysfrom colour import Colorimport numpy as np+from .. import configfrom ..constants import *-from ..config import configfrom ..container import Containerfrom ..utils.color import color_gradientfrom ..utils.color import interpolate_colordiff --git a/manim/mobject/number_line.py b/manim/mobject/number_line.pyindex 0d827df26..1c148d072 100644--- a/manim/mobject/number_line.py+++ b/manim/mobject/number_line.py@@ -6,8 +6,8 @@ __all__ = ["NumberLine", "UnitInterval"]import operator as op+from .. import configfrom ..constants import *-from ..config import configfrom ..mobject.geometry import Linefrom ..mobject.numbers import DecimalNumberfrom ..mobject.types.vectorized_mobject import VGroupdiff --git a/manim/mobject/svg/drawings.py b/manim/mobject/svg/drawings.pyindex 95614fddb..2bc9d870c 100644--- a/manim/mobject/svg/drawings.py+++ b/manim/mobject/svg/drawings.py@@ -28,10 +28,10 @@ __all__ = [import itertools as itimport string+from ... import configfrom ...animation.animation import Animationfrom ...animation.rotation import Rotatingfrom ...constants import *-from ...config import configfrom ...mobject.geometry import AnnularSectorfrom ...mobject.geometry import Arcfrom ...mobject.geometry import Circlediff --git a/manim/mobject/svg/tex_mobject.py b/manim/mobject/svg/tex_mobject.pyindex 9f6afa315..dc265e394 100644--- a/manim/mobject/svg/tex_mobject.py+++ b/manim/mobject/svg/tex_mobject.py@@ -12,8 +12,8 @@ __all__ = [from functools import reduceimport operator as op+from ... import configfrom ...constants import *-from ...config import configfrom ...mobject.geometry import Linefrom ...mobject.svg.svg_mobject import SVGMobjectfrom ...mobject.svg.svg_mobject import VMobjectFromSVGPathstringdiff --git a/manim/mobject/svg/text_mobject.py b/manim/mobject/svg/text_mobject.pyindex 6edfca975..c161d5d1b 100644--- a/manim/mobject/svg/text_mobject.py+++ b/manim/mobject/svg/text_mobject.py@@ -7,10 +7,9 @@ import copyimport hashlibimport cairo+from ... import config, file_writer_config, loggerfrom ...constants import *-from ...config import config, file_writer_configfrom ...container import Container-from ...logger import loggerfrom ...mobject.geometry import Dot, Rectanglefrom ...mobject.svg.svg_mobject import SVGMobjectfrom ...mobject.types.vectorized_mobject import VGroupdiff --git a/manim/mobject/vector_field.py b/manim/mobject/vector_field.pyindex 48971ec71..f9078b226 100644--- a/manim/mobject/vector_field.py+++ b/manim/mobject/vector_field.py@@ -18,9 +18,8 @@ import itertools as itfrom PIL import Imageimport random+from .. import config, loggerfrom ..constants import *-from ..config import config-from ..logger import loggerfrom ..animation.composition import AnimationGroupfrom ..animation.indication import ShowPassingFlashfrom ..mobject.geometry import Vectordiff --git a/manim/scene/graph_scene.py b/manim/scene/graph_scene.pyindex 67fd95daf..68789b5df 100644--- a/manim/scene/graph_scene.py+++ b/manim/scene/graph_scene.py@@ -1,8 +1,9 @@__all__ = ["GraphScene"]+import itertools as it-from ..config import config+from .. import configfrom ..animation.creation import Write, DrawBorderThenFill, ShowCreationfrom ..animation.transform import Transformfrom ..animation.update import UpdateFromAlphaFuncdiff --git a/manim/scene/scene.py b/manim/scene/scene.pyindex d3ad0f329..1ca43e09a 100644--- a/manim/scene/scene.py+++ b/manim/scene/scene.py@@ -13,13 +13,12 @@ import copyfrom tqdm import tqdm as ProgressDisplayimport numpy as np+from .. import camera_config, file_writer_config, loggerfrom ..animation.animation import Animationfrom ..animation.transform import MoveToTarget, ApplyMethodfrom ..camera.camera import Camerafrom ..constants import *-from ..config import camera_config, file_writer_configfrom ..container import Container-from ..logger import loggerfrom ..mobject.mobject import Mobjectfrom ..scene.scene_file_writer import SceneFileWriterfrom ..utils.iterables import list_updatediff --git a/manim/scene/scene_file_writer.py b/manim/scene/scene_file_writer.pyindex 6f835fbbb..eb9e8b728 100644--- a/manim/scene/scene_file_writer.py+++ b/manim/scene/scene_file_writer.py@@ -11,9 +11,8 @@ from time import sleepimport datetimefrom PIL import Image+from .. import file_writer_config, logger, consolefrom ..constants import FFMPEG_BIN, GIF_FILE_EXTENSION-from ..config import file_writer_config-from ..logger import logger, consolefrom ..utils.config_ops import digest_configfrom ..utils.file_ops import guarantee_existencefrom ..utils.file_ops import add_extension_if_not_presentdiff --git a/manim/scene/three_d_scene.py b/manim/scene/three_d_scene.pyindex 8b83f7cd7..6f8cfc4f4 100644--- a/manim/scene/three_d_scene.py+++ b/manim/scene/three_d_scene.py@@ -1,10 +1,10 @@__all__ = ["ThreeDScene", "SpecialThreeDScene"]+from .. import configfrom ..animation.transform import ApplyMethodfrom ..camera.three_d_camera import ThreeDCamerafrom ..constants import DEGREES-from ..config import configfrom ..mobject.coordinate_systems import ThreeDAxesfrom ..mobject.geometry import Linefrom ..mobject.three_dimensions import Spherediff --git a/manim/scene/vector_space_scene.py b/manim/scene/vector_space_scene.pyindex 5f833deee..8d96d3ad6 100644--- a/manim/scene/vector_space_scene.py+++ b/manim/scene/vector_space_scene.py@@ -3,6 +3,8 @@ __all__ = ["VectorScene", "LinearTransformationScene"]import numpy as np+from .. import config+from ..constants import *from ..animation.animation import Animationfrom ..animation.creation import ShowCreationfrom ..animation.creation import Write@@ -11,8 +13,6 @@ from ..animation.growing import GrowArrowfrom ..animation.transform import ApplyFunctionfrom ..animation.transform import ApplyPointwiseFunctionfrom ..animation.transform import Transform-from ..constants import *-from ..config import configfrom ..mobject.coordinate_systems import Axesfrom ..mobject.coordinate_systems import NumberPlanefrom ..mobject.geometry import Arrowdiff --git a/manim/utils/hashing.py b/manim/utils/hashing.pyindex 454b9b206..4946f6f88 100644--- a/manim/utils/hashing.py+++ b/manim/utils/hashing.py@@ -6,7 +6,7 @@ import disimport numpy as npfrom types import ModuleType-from ..logger import logger+from .. import loggerclass CustomEncoder(json.JSONEncoder):diff --git a/manim/utils/tex_file_writing.py b/manim/utils/tex_file_writing.pyindex b736c4f92..fefdd5821 100644--- a/manim/utils/tex_file_writing.py+++ b/manim/utils/tex_file_writing.py@@ -2,9 +2,7 @@ import osimport hashlibfrom pathlib import Path-from .. import constants-from ..config import file_writer_config, config-from ..logger import logger+from .. import file_writer_config, config, loggerdef tex_hash(expression):diff --git a/setup.py b/setup.pyindex 019d96cd4..fa451113c 100755--- a/setup.py+++ b/setup.py@@ -6,7 +6,7 @@ setup(description="Animation engine for explanatory math videos",license="MIT",packages=find_namespace_packages(),- package_data={"manim": ["*.tex", "*.cfg"]},+ package_data={"manim": ["*.tex", "config/*.cfg"]},entry_points={"console_scripts": ["manim=manim.__main__:main", "manimcm=manim.__main__:main",]},diff --git a/tests/test_cli/manim.cfg b/tests/test_cli/manim.cfgindex ae9ef35bc..3f866d46f 100644--- a/tests/test_cli/manim.cfg+++ b/tests/test_cli/manim.cfg@@ -6,3 +6,6 @@ verbosity = DEBUG# write_all = Falsesave_last_frame = True# save_pngs = False++[logger]+log_width = 512\ No newline at end of filediff --git a/tests/test_imports.py b/tests/test_imports.pyindex 55ed89a48..4560d4e98 100644--- a/tests/test_imports.py+++ b/tests/test_imports.py@@ -1,2 +1,13 @@+from types import ModuleType+def test_import():+ # check that the package imports without errorsimport manim++ # check that we have access to both the module and dict+ from manim import _config, config+ assert isinstance(_config, ModuleType)+ assert isinstance(config, dict)++ # check that we have access to the logger+ from manim import logger, console