Skip to content

Commit

Permalink
Format Imports using Isort (ManimCommunity#1178)
Browse files Browse the repository at this point in the history
* Format imports using Isort.
Add a check for pull requests.

Signed-off-by: Naveen M K <[email protected]>

* CI: update check's name
  • Loading branch information
naveen521kk authored Apr 3, 2021
1 parent 5692334 commit dcb90a8
Show file tree
Hide file tree
Showing 129 changed files with 554 additions and 533 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,22 @@ jobs:
- name: Run Flake8
run: |
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 .
11 changes: 5 additions & 6 deletions docs/source/manim_directive.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,16 @@ def construct(self):
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 jinja2
import os
import shutil
from os.path import relpath
from pathlib import Path
from typing import List

import shutil
import jinja2
from docutils import nodes
from docutils.parsers.rst import Directive, directives
from docutils.statemachine import StringList

from manim import QUALITIES

Expand Down
4 changes: 2 additions & 2 deletions example_scenes/opengl.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from manim import *
from manim.opengl import *
import os
from 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.
Expand Down
33 changes: 12 additions & 21 deletions manim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
# 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 *
Expand All @@ -28,24 +23,23 @@
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 *
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 *
Expand All @@ -62,42 +56,39 @@
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, unit
from .utils.bezier import *
from .utils.color import *
from .utils import color as color
from .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_functions
from .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 unit

try:
from IPython import get_ipython

from .utils.ipython_magic import ManimMagic
except ImportError:
pass
Expand Down
5 changes: 3 additions & 2 deletions manim/__main__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import sys

import click
from click_default_group import DefaultGroup

from . import __version__, console
from .constants import EPILOG
from .constants import CONTEXT_SETTINGS
from .cli.cfg.commands import cfg
from .cli.plugins.commands import plugins
from .cli.render.commands import render
from .constants import CONTEXT_SETTINGS, EPILOG


def exit_early(ctx, param, value):
Expand Down
2 changes: 1 addition & 1 deletion manim/_config/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import argparse
import configparser
import copy
import errno
import logging
import os
import errno
import sys
import typing
from collections.abc import Mapping, MutableMapping
Expand Down
7 changes: 3 additions & 4 deletions manim/animation/animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@


import typing
from typing import Union
from copy import deepcopy
from typing import Union

import numpy as np

if typing.TYPE_CHECKING:
from manim.scene.scene import Scene

from .. import logger
from ..mobject import mobject
from ..mobject import opengl_mobject
from ..mobject import mobject, opengl_mobject
from ..mobject.mobject import Mobject
from ..utils.rate_functions import smooth
from ..mobject.opengl_mobject import OpenGLMobject
from ..utils.rate_functions import smooth

DEFAULT_ANIMATION_RUN_TIME: float = 1.0
DEFAULT_ANIMATION_LAG_RATIO: float = 0.0
Expand Down
4 changes: 2 additions & 2 deletions manim/animation/creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ def construct(self):

import numpy as np
from colour import Color
from .. import logger

from .. import logger

if typing.TYPE_CHECKING:
from manim.mobject.svg.text_mobject import Text

from ..animation.animation import Animation
from ..animation.composition import Succession
from ..mobject.mobject import Group, Mobject
from ..mobject.types.vectorized_mobject import VMobject
from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.bezier import integer_interpolate
from ..utils.rate_functions import double_smooth, linear, smooth

Expand Down
2 changes: 1 addition & 1 deletion manim/animation/fading.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ def construct(self):
from ..animation.transform import Transform
from ..constants import DOWN, ORIGIN
from ..mobject.mobject import Group
from ..mobject.types.vectorized_mobject import VMobject
from ..mobject.types.opengl_vectorized_mobject import OpenGLVMobject
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.bezier import interpolate
from ..utils.rate_functions import there_and_back

Expand Down
12 changes: 6 additions & 6 deletions manim/animation/transform_matching_parts.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
__all__ = ["TransformMatchingShapes", "TransformMatchingTex"]


import numpy as np
from 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, Mobject
from ..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, Transform


class TransformMatchingAbstractBase(AnimationGroup):
Expand Down
17 changes: 8 additions & 9 deletions manim/camera/camera.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,29 @@

__all__ = ["Camera", "BackgroundColoredVMobjectDisplayer"]

from functools import reduce
import copy
import itertools as it
import operator as op
import time
import copy
from functools import reduce

from PIL import Image
from scipy.spatial.distance import pdist
import cairo
import numpy as np
from PIL import Image
from scipy.spatial.distance import pdist

from .. import logger, config
from .. import config, logger
from ..constants import *
from ..mobject.types.image_mobject import AbstractImageMobject
from ..mobject.mobject import Mobject
from ..mobject.types.image_mobject import AbstractImageMobject
from ..mobject.types.point_cloud_mobject import PMobject
from ..mobject.types.vectorized_mobject import VMobject
from ..utils.color import color_to_int_rgba
from ..utils.family import extract_mobject_family_members
from ..utils.images import get_full_raster_image_path
from ..utils.iterables import list_difference_update
from ..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_norm


class Camera:
Expand Down
3 changes: 2 additions & 1 deletion manim/camera/webgl_camera.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from .camera import Camera
import copy

from .camera import Camera


class WebGLCamera(Camera):
def __init__(self, **kwargs):
Expand Down
7 changes: 3 additions & 4 deletions manim/cli/cfg/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@
"""
import os
import click

from ast import literal_eval
from typing import Union

import click
from rich.errors import StyleSyntaxError
from rich.style import Style

from ... import config, console
from ...constants import EPILOG
from ...constants import CONTEXT_SETTINGS
from ..._config.utils import config_file_paths, make_config_parser
from ...constants import CONTEXT_SETTINGS, EPILOG
from ...utils.file_ops import guarantee_existence, open_file

RICH_COLOUR_INSTRUCTIONS: str = """
Expand Down
4 changes: 1 addition & 3 deletions manim/cli/plugins/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
"""
import click

from ...constants import EPILOG
from ...constants import CONTEXT_SETTINGS

from ...constants import CONTEXT_SETTINGS, EPILOG
from ...plugins.plugins_flags import list_plugins


Expand Down
6 changes: 3 additions & 3 deletions manim/cli/render/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
import click
import cloup

from ... import config, console, logger
from ...constants import CONTEXT_SETTINGS, EPILOG
from ...utils.module_ops import scene_classes_from_file
from .ease_of_access_options import ease_of_access_options
from .global_options import global_options
from .output_options import output_options
from .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(
Expand Down
1 change: 0 additions & 1 deletion manim/cli/render/global_options.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import click
from cloup import option, option_group


global_options = option_group(
"Global options",
option(
Expand Down
1 change: 1 addition & 0 deletions manim/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@


from abc import ABC, abstractmethod

from . import logger


Expand Down
3 changes: 1 addition & 2 deletions manim/grpc/gen/frameserver_pb2_grpc.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion manim/grpc/gen/renderserver_pb2_grpc.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dcb90a8

Please sign in to comment.