Create config subpackage (#376)

* add __all__ variables to all modules

* move all the config stuff into a new config/ folder and make it a subpackage by adding a config/__init__.py file. This will make it easier to continue refactoring the config system later

* fix: almost reverted a previous PR

* fix setup.py

* Set log_width to 512 for test_cli

Co-authored-by: Aathish Sivasubrahmanian <[email protected]>

Author: leotrs

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 *
 

manim/__main__.py

@@ -8,14 +8,12 @@
 import importlib.util
 import 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_subcmds
 from .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_sound
 from .utils.file_ops import open_file as open_media_file
-from . import constants
-from .logger import logger, console
 
 
 def open_file_if_needed(file_writer):

manim/animation/fading.py

@@ -23,7 +23,7 @@
 from ..mobject.types.vectorized_mobject import VMobject
 from ..utils.bezier import interpolate
 from ..utils.rate_functions import there_and_back
-from ..logger import logger
+from .. import logger
 
 
 DEFAULT_FADE_LAG_RATIO = 0

manim/animation/indication.py

@@ -18,8 +18,8 @@
 
 import numpy as np
 
+from .. import config
 from ..constants import *
-from ..config import config
 from ..animation.animation import Animation
 from ..animation.movement import Homotopy
 from ..animation.composition import AnimationGroup

manim/camera/camera.py

@@ -15,9 +15,8 @@
 import cairo
 import numpy as np
 
+from .. import logger, config, camera_config
 from ..constants import *
-from ..config import config, camera_config
-from ..logger import logger
 from ..mobject.types.image_mobject import AbstractImageMobject
 from ..mobject.mobject import Mobject
 from ..mobject.types.point_cloud_mobject import PMobject

manim/camera/moving_camera.py

@@ -1,8 +1,8 @@
 __all__ = ["CameraFrame", "MovingCamera"]
 
 
+from .. import config
 from ..camera.camera import Camera
-from ..config import config
 from ..constants import ORIGIN, WHITE
 from ..mobject.frame import ScreenRectangle
 from ..mobject.types.vectorized_mobject import VGroup

manim/camera/three_d_camera.py

@@ -3,9 +3,9 @@
 
 import numpy as np
 
+from .. import config
 from ..camera.camera import Camera
 from ..constants import *
-from ..config import config
 from ..mobject.three_d_utils import get_3d_vmob_end_corner
 from ..mobject.three_d_utils import get_3d_vmob_end_corner_unit_normal
 from ..mobject.three_d_utils import get_3d_vmob_start_corner

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"]

manim/utils/cfg_subcmds.py renamed to manim/config/cfg_subcmds.py

@@ -11,7 +11,7 @@
 from ast import literal_eval
 
 from .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_file
 
 from rich.console import Console
 from rich.style import Style

manim/config.py renamed to manim/config/config.py

@@ -4,19 +4,22 @@
 Process the manim.cfg file and the command line arguments into a single
 config object.
 """
+
+
+__all__ = ["file_writer_config", "config", "camera_config", "tempconfig"]
+
+
 import os
 import sys
 from contextlib import contextmanager
 
 import 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_line
 
 from .logger import logger
-from .utils.tex import TexTemplate, TexTemplateFromFile
-
-__all__ = ["file_writer_config", "config", "camera_config", "tempconfig"]
+from ..utils.tex import TexTemplate, TexTemplateFromFile
 
 
 config = None