From bc611bc76dde5c92eeafcaa5788b39c0618ef334 Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 13:34:31 -0500 Subject: [PATCH 1/9] Remove unused import --- manim/mobject/table.py | 1 - 1 file changed, 1 deletion(-) diff --git a/manim/mobject/table.py b/manim/mobject/table.py index ff0c0f0bd9..1a1beffad1 100644 --- a/manim/mobject/table.py +++ b/manim/mobject/table.py @@ -74,7 +74,6 @@ def construct(self): from manim.mobject.text.tex_mobject import MathTex from manim.mobject.text.text_mobject import Paragraph -from .. import config from ..animation.animation import Animation from ..animation.composition import AnimationGroup from ..animation.creation import Create, Write From d54029073a98aa4e37ddfb9f4b41e6ac6299c5c3 Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 13:40:35 -0500 Subject: [PATCH 2/9] More security fixes --- manim/__main__.py | 2 -- manim/mobject/mobject.py | 2 +- manim/renderer/opengl_renderer.py | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/manim/__main__.py b/manim/__main__.py index c11ca88450..f05f4c2971 100644 --- a/manim/__main__.py +++ b/manim/__main__.py @@ -1,7 +1,5 @@ from __future__ import annotations -import sys - import click import cloup diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py index 1b5eed0d58..85d66bb194 100644 --- a/manim/mobject/mobject.py +++ b/manim/mobject/mobject.py @@ -350,7 +350,7 @@ def reset_points(self) -> None: """Sets :attr:`points` to be an empty array.""" self.points = np.zeros((0, self.dim)) - def init_colors(self) -> None: + def init_colors(self) -> Self: """Initializes the colors. Gets called upon creation. This is an empty method that can be implemented by diff --git a/manim/renderer/opengl_renderer.py b/manim/renderer/opengl_renderer.py index 79390be97c..d457682267 100644 --- a/manim/renderer/opengl_renderer.py +++ b/manim/renderer/opengl_renderer.py @@ -219,9 +219,6 @@ def interpolate(self, *args, **kwargs): self.refresh_rotation_matrix() -points_per_curve = 3 - - class OpenGLRenderer: def __init__(self, file_writer_class=SceneFileWriter, skip_animations=False): # Measured in pixel widths, used for vector graphics From 1561c107ff5acd85548b3e4b52e9f1f68636ab97 Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 13:40:58 -0500 Subject: [PATCH 3/9] Remove unused global variable --- manim/mobject/opengl/opengl_geometry.py | 1 - 1 file changed, 1 deletion(-) diff --git a/manim/mobject/opengl/opengl_geometry.py b/manim/mobject/opengl/opengl_geometry.py index 3e81f6f6f3..2ec0bbe4dd 100644 --- a/manim/mobject/opengl/opengl_geometry.py +++ b/manim/mobject/opengl/opengl_geometry.py @@ -23,7 +23,6 @@ ) DEFAULT_DOT_RADIUS = 0.08 -DEFAULT_SMALL_DOT_RADIUS = 0.04 DEFAULT_DASH_LENGTH = 0.05 DEFAULT_ARROW_TIP_LENGTH = 0.35 DEFAULT_ARROW_TIP_WIDTH = 0.35 From d922acb8fc48dbfde615e43bb4d4b71d98ec5d1b Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 13:46:31 -0500 Subject: [PATCH 4/9] More fixes --- manim/mobject/mobject.py | 4 ++-- manim/mobject/text/tex_mobject.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py index 85d66bb194..160bcfacec 100644 --- a/manim/mobject/mobject.py +++ b/manim/mobject/mobject.py @@ -2700,13 +2700,13 @@ def push_self_into_submobjects(self) -> Self: def add_n_more_submobjects(self, n: int) -> Self | None: if n == 0: - return + return None curr = len(self.submobjects) if curr == 0: # If empty, simply add n point mobjects self.submobjects = [self.get_point_mobject() for k in range(n)] - return + return None target = curr + n # TODO, factor this out to utils so as to reuse diff --git a/manim/mobject/text/tex_mobject.py b/manim/mobject/text/tex_mobject.py index 47cbe6cd96..029b5ce009 100644 --- a/manim/mobject/text/tex_mobject.py +++ b/manim/mobject/text/tex_mobject.py @@ -34,7 +34,7 @@ from manim.constants import * from manim.mobject.geometry.line import Line from manim.mobject.svg.svg_mobject import SVGMobject -from manim.mobject.types.vectorized_mobject import VectorizedPoint, VGroup, VMobject +from manim.mobject.types.vectorized_mobject import VGroup, VMobject from manim.utils.tex import TexTemplate from manim.utils.tex_file_writing import tex_to_svg_file From 51bcf4a34c609f811b260a17805722779a757a38 Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 13:50:20 -0500 Subject: [PATCH 5/9] Revert change (actual fix would require some rewrite) --- manim/mobject/mobject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py index 160bcfacec..9b79f67111 100644 --- a/manim/mobject/mobject.py +++ b/manim/mobject/mobject.py @@ -350,7 +350,7 @@ def reset_points(self) -> None: """Sets :attr:`points` to be an empty array.""" self.points = np.zeros((0, self.dim)) - def init_colors(self) -> Self: + def init_colors(self) -> None: """Initializes the colors. Gets called upon creation. This is an empty method that can be implemented by From 4515a3082677c14e542830ae9e1e77dcf2b6d260 Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 13:55:13 -0500 Subject: [PATCH 6/9] Add exception for edge case to satisfy warning --- manim/mobject/types/vectorized_mobject.py | 1 + 1 file changed, 1 insertion(+) diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.py index 8312b74459..86f4fcd5a5 100644 --- a/manim/mobject/types/vectorized_mobject.py +++ b/manim/mobject/types/vectorized_mobject.py @@ -1406,6 +1406,7 @@ def point_from_proportion(self, alpha: float) -> Point3D: return curve(residue) current_length += length + raise Exception("Not sure how you reached here, please file a bug report at https://github.com/ManimCommunity/manim/issues/new/choose") def proportion_from_point( self, From 6011a75af462d49d14e5a07e596e3a527616a33b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:57:06 +0000 Subject: [PATCH 7/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- manim/mobject/types/vectorized_mobject.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.py index 86f4fcd5a5..0bca92df60 100644 --- a/manim/mobject/types/vectorized_mobject.py +++ b/manim/mobject/types/vectorized_mobject.py @@ -1406,7 +1406,9 @@ def point_from_proportion(self, alpha: float) -> Point3D: return curve(residue) current_length += length - raise Exception("Not sure how you reached here, please file a bug report at https://github.com/ManimCommunity/manim/issues/new/choose") + raise Exception( + "Not sure how you reached here, please file a bug report at https://github.com/ManimCommunity/manim/issues/new/choose" + ) def proportion_from_point( self, From 926bdab5ae6c55dc501410fc69cad3f0a3c8177b Mon Sep 17 00:00:00 2001 From: JasonGrace2282 Date: Thu, 15 Feb 2024 14:14:00 -0500 Subject: [PATCH 8/9] Stuff --- manim/mobject/types/vectorized_mobject.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.py index 0bca92df60..0b0bb883e6 100644 --- a/manim/mobject/types/vectorized_mobject.py +++ b/manim/mobject/types/vectorized_mobject.py @@ -26,9 +26,7 @@ ) import numpy as np -import numpy.typing as npt from PIL.Image import Image -from typing_extensions import Self from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject @@ -36,10 +34,10 @@ get_3d_vmob_gradient_start_and_end_points, ) -from ... import config -from ...constants import * -from ...mobject.mobject import Mobject -from ...utils.bezier import ( +from manim import config +from manim.constants import * +from manim.mobject.mobject import Mobject +from manim.utils.bezier import ( bezier, get_smooth_handle_points, integer_interpolate, @@ -47,9 +45,9 @@ partial_bezier_points, proportions_along_bezier_curve_for_point, ) -from ...utils.color import BLACK, WHITE, ManimColor, ParsableManimColor -from ...utils.iterables import make_even, resize_array, stretch_array_to_length, tuplify -from ...utils.space_ops import rotate_vector, shoelace_direction +from manim.utils.color import BLACK, WHITE, ManimColor, ParsableManimColor +from manim.utils.iterables import make_even, resize_array, stretch_array_to_length, tuplify +from manim.utils.space_ops import rotate_vector, shoelace_direction if TYPE_CHECKING: from manim.typing import ( @@ -65,6 +63,8 @@ Vector3D, Zeros, ) + import numpy.typing as npt + from typing_extensions import Self # TODO # - Change cubic curve groups to have 4 points instead of 3 @@ -2385,7 +2385,7 @@ def add_key_value_pair(self, key: Hashable, value: VMobject) -> None: mob = value if self.show_keys: # This import is here and not at the top to avoid circular import - from manim.mobject.text.tex_mobject import Tex + from manim.mobject.text.tex_mobject import Tex key_text = Tex(str(key)).next_to(value, LEFT) mob.add(key_text) From ffc4eaebff747c5e8f3411959040e79cf3e685fd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 19:14:52 +0000 Subject: [PATCH 9/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- manim/mobject/types/vectorized_mobject.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/manim/mobject/types/vectorized_mobject.py b/manim/mobject/types/vectorized_mobject.py index 0b0bb883e6..ec15646c31 100644 --- a/manim/mobject/types/vectorized_mobject.py +++ b/manim/mobject/types/vectorized_mobject.py @@ -28,15 +28,14 @@ import numpy as np from PIL.Image import Image +from manim import config +from manim.constants import * +from manim.mobject.mobject import Mobject from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject from manim.mobject.three_d.three_d_utils import ( get_3d_vmob_gradient_start_and_end_points, ) - -from manim import config -from manim.constants import * -from manim.mobject.mobject import Mobject from manim.utils.bezier import ( bezier, get_smooth_handle_points, @@ -46,10 +45,18 @@ proportions_along_bezier_curve_for_point, ) from manim.utils.color import BLACK, WHITE, ManimColor, ParsableManimColor -from manim.utils.iterables import make_even, resize_array, stretch_array_to_length, tuplify +from manim.utils.iterables import ( + make_even, + resize_array, + stretch_array_to_length, + tuplify, +) from manim.utils.space_ops import rotate_vector, shoelace_direction if TYPE_CHECKING: + import numpy.typing as npt + from typing_extensions import Self + from manim.typing import ( BezierPoints, CubicBezierPoints, @@ -63,8 +70,6 @@ Vector3D, Zeros, ) - import numpy.typing as npt - from typing_extensions import Self # TODO # - Change cubic curve groups to have 4 points instead of 3 @@ -2385,7 +2390,7 @@ def add_key_value_pair(self, key: Hashable, value: VMobject) -> None: mob = value if self.show_keys: # This import is here and not at the top to avoid circular import - from manim.mobject.text.tex_mobject import Tex + from manim.mobject.text.tex_mobject import Tex key_text = Tex(str(key)).next_to(value, LEFT) mob.add(key_text)