Merge pull request #78 from ManimCommunity/fix-init-main-entrypoints

Fix __init__.py, __main__.py, and entrypoints

Author: leotrs

example_scenes/basic.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from manim.imports import *
+from manim import *
 
 # To watch one of these scenes, run the following:
 # python -m manim example_scenes.py SquareToCircle -pl

manim/__init__.py

@@ -1,11 +1,71 @@
 #!/usr/bin/env python
-from . import extract_scene
-from . import config
-from . import constants
+from .constants import *
 
+from .animation.animation import *
+from .animation.composition import *
+from .animation.creation import *
+from .animation.fading import *
+from .animation.growing import *
+from .animation.indication import *
+from .animation.movement import *
+from .animation.numbers import *
+from .animation.rotation import *
+from .animation.specialized import *
+from .animation.transform import *
+from .animation.update import *
 
-def main():
-    args = config.parse_cli()
-    cfg = config.get_configuration(args)
-    config.initialize_directories(cfg)
-    extract_scene.main(cfg)
+from .camera.camera import *
+from .camera.mapping_camera import *
+from .camera.moving_camera import *
+from .camera.three_d_camera import *
+
+from .mobject.coordinate_systems import *
+from .mobject.changing import *
+from .mobject.frame import *
+from .mobject.functions import *
+from .mobject.geometry import *
+from .mobject.matrix import *
+from .mobject.mobject import *
+from .mobject.number_line import *
+from .mobject.numbers import *
+from .mobject.probability import *
+from .mobject.shape_matchers import *
+from .mobject.svg.brace import *
+from .mobject.svg.drawings import *
+from .mobject.svg.svg_mobject import *
+from .mobject.svg.tex_mobject import *
+from .mobject.svg.text_mobject import *
+from .mobject.svg.code_mobject import *
+from .mobject.three_d_utils import *
+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 .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.graph_scene import *
+from .scene.scene_from_video import *
+from .scene.three_d_scene import *
+from .scene.vector_space_scene import *
+from .scene.zoomed_scene import *
+
+from .utils.bezier import *
+from .utils.color import *
+from .utils.config_ops import *
+from .utils.debug 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.simple_functions import *
+from .utils.sounds import *
+from .utils.space_ops import *
+from .utils.strings import *

manim/__main__.py

@@ -1,3 +1,14 @@
-from . import main
+from . import extract_scene
+from . import config
+from . import constants
 
-main()
+
+def main():
+    args = config.parse_cli()
+    cfg = config.get_configuration(args)
+    config.initialize_directories(cfg)
+    extract_scene.main(cfg)
+
+
+if __name__ == "__main__":
+    main()

manim/config.py

@@ -8,6 +8,9 @@
 from . import dirs
 from .logger import logger
 
+__all__ = ["parse_cli", "get_configuration", "initialize_directories"]
+
+
 def parse_cli():
     try:
         parser = argparse.ArgumentParser()
@@ -36,7 +39,7 @@ def parse_cli():
             help="Save the last frame",
         )
         parser.add_argument(
-            "--dry_run", 
+            "--dry_run",
             action="store_true",
             help= "Do a dry run (render scenes but generate no output files)",
         )
@@ -269,7 +272,7 @@ def initialize_directories(config):
 
     if not config["video_dir"] or dirs.VIDEO_DIR:
         dir_config["video_dir"] = os.path.join(dir_config["media_dir"], "videos")
-        
+
     for folder in [dir_config["video_dir"], dir_config["tex_dir"], dir_config["text_dir"]]:
         if folder != "" and not os.path.exists(folder):
             os.makedirs(folder)

manim/extract_scene.py

@@ -181,7 +181,3 @@ def main(config):
             print("\n\n")
             if config["sound"]:
                 play_error_sound()
-
-
-if __name__ == "__main__":
-    main()

manim/imports.py

@@ -9,5 +9,5 @@ opencv-python
 pycairo
 pydub
 pygments
-pyreadline; sys_platform == 'win32',
+pyreadline; sys_platform == 'win32'
 rich

requirements.txt

@@ -1,4 +1,5 @@
 from setuptools import setup, find_namespace_packages
+
 setup(
     name="manimlib",
     version="0.2.0",
@@ -8,8 +9,8 @@
     package_data={ "manim": ["*.tex"] },
     entry_points={
         "console_scripts": [
-            "manim=manim:main",
-            "manimcm=manim:main",
+            "manim=manim.__main__:main",
+            "manimcm=manim.__main__:main",
         ]
     },
     install_requires=[