A community-maintained Python framework for creating mathematical animations.
The __init__ file is executed when the user imports our package, so this is the natural file to place all imports. This removes the necessity for a separate imports.py file. Also, the main entrypoint has been moved from __init__.py to __main__.py, as intended by python packaging standards. Finally, the extract_scene.py module is not an entrypoint so it does not require a `if __name__ == __main__` clause. Finally, this commit also fixes a typo (extra trailing comma) in requirements.py
leotrs9958044e0ea1
diff --git a/example_scenes/basic.py b/example_scenes/basic.pyindex 1c4daa3b3..84f1e2b53 100644--- a/example_scenes/basic.py+++ b/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 -pldiff --git a/manim/__init__.py b/manim/__init__.pyindex 505db0fb4..2c56030b4 100644--- a/manim/__init__.py+++ b/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 *diff --git a/manim/__main__.py b/manim/__main__.pyindex 8273c4ff5..08dc1d325 100644--- a/manim/__main__.py+++ b/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()diff --git a/manim/config.py b/manim/config.pyindex b511fe342..7c5f8627d 100644--- a/manim/config.py+++ b/manim/config.py@@ -8,6 +8,9 @@ from . import constantsfrom . import dirsfrom .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)diff --git a/manim/extract_scene.py b/manim/extract_scene.pyindex e0d750af9..b8a0ad96d 100644--- a/manim/extract_scene.py+++ b/manim/extract_scene.py@@ -181,7 +181,3 @@ def main(config):print("\n\n")if config["sound"]:play_error_sound()---if __name__ == "__main__":- main()diff --git a/manim/imports.py b/manim/imports.pydeleted file mode 100644index 72b9cb212..000000000--- a/manim/imports.py+++ /dev/null@@ -1,102 +0,0 @@-"""-I won't pretend like this is best practice, by in creating animations for a video,-it can be very nice to simply have all of the Mobjects, Animations, Scenes, etc.-of manim available without having to worry about what namespace they come from.--Rather than having a large pile of "from <module> import *" at the top of every such-script, the intent of this file is to make it so that one can just include-"from manim.imports import *". The effects of adding more modules-or refactoring the library on current or older scene scripts should be entirely-addressible by changing this file.--Note: One should NOT import from this file for main library code, it is meant only-as a convenience for scripts creating scenes for videos.-"""---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 *--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 *--# Non manim libraries that are also nice to have without thinking--import inspect-import itertools as it-import numpy as np-import operator as op-import os-import random-import re-import string-import sys-import math--from PIL import Image-from colour import Colordiff --git a/requirements.txt b/requirements.txtindex 7dec25c9b..f9fb3b902 100644--- a/requirements.txt+++ b/requirements.txt@@ -9,5 +9,5 @@ opencv-pythonpycairopydubpygments-pyreadline; sys_platform == 'win32',+pyreadline; sys_platform == 'win32'richdiff --git a/setup.py b/setup.pyindex 4552d4c3c..2cb6b855f 100755--- a/setup.py+++ b/setup.py@@ -1,4 +1,5 @@from setuptools import setup, find_namespace_packages+setup(name="manimlib",version="0.2.0",@@ -8,8 +9,8 @@ setup(package_data={ "manim": ["*.tex"] },entry_points={"console_scripts": [- "manim=manim:main",- "manimcm=manim:main",+ "manim=manim.__main__:main",+ "manimcm=manim.__main__:main",]},install_requires=[