From 246e44b3d0905c8eb03e30d6f1b8e1aff2301056 Mon Sep 17 00:00:00 2001 From: adeshpande <110117391+JasonGrace2282@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:24:19 -0400 Subject: [PATCH 1/3] Fix incorrect version number in plugin section in docs (#3849) --- docs/source/plugins.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst index c4c631b655..7bd8c0061c 100644 --- a/docs/source/plugins.rst +++ b/docs/source/plugins.rst @@ -106,7 +106,7 @@ specified in Poetry as: [tool.poetry.plugins."manim.plugins"] "name" = "object_reference" -.. versionremoved:: 0.19.0 +.. versionremoved:: 0.18.1 Plugins should be imported explicitly to be usable in user code. The plugin system will probably be refactored in the future to provide a more structured From bf2feee19e3eb80aa3dfac014f848fc6c22a85af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 13:18:45 -0400 Subject: [PATCH 2/3] Bump zipp from 3.18.2 to 3.19.1 (#3847) Bumps [zipp](https://github.com/jaraco/zipp) from 3.18.2 to 3.19.1. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.18.2...v3.19.1) --- updated-dependencies: - dependency-name: zipp dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index b1455106d8..081f5314b3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4659,18 +4659,18 @@ files = [ [[package]] name = "zipp" -version = "3.18.2" +version = "3.19.1" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.18.2-py3-none-any.whl", hash = "sha256:dce197b859eb796242b0622af1b8beb0a722d52aa2f57133ead08edd5bf5374e"}, - {file = "zipp-3.18.2.tar.gz", hash = "sha256:6278d9ddbcfb1f1089a88fde84481528b07b0e10474e09dcfe53dad4069fa059"}, + {file = "zipp-3.19.1-py3-none-any.whl", hash = "sha256:2828e64edb5386ea6a52e7ba7cdb17bb30a73a858f5eb6eb93d8d36f5ea26091"}, + {file = "zipp-3.19.1.tar.gz", hash = "sha256:35427f6d5594f4acf82d25541438348c26736fa9b3afa2754bcd63cdb99d8e8f"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [extras] gui = ["dearpygui"] From 67f95db213ab02377e1c63039104076659eab67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Manr=C3=ADquez=20Novoa?= <49853152+chopan050@users.noreply.github.com> Date: Fri, 12 Jul 2024 10:07:44 -0400 Subject: [PATCH 3/3] Rename typing.Image type aliases to PixelArray to avoid conflict with PIL.Image (#3851) --- manim/mobject/mobject.py | 4 ++-- manim/typing.py | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manim/mobject/mobject.py b/manim/mobject/mobject.py index 6e405a18eb..ee487a7fc5 100644 --- a/manim/mobject/mobject.py +++ b/manim/mobject/mobject.py @@ -44,11 +44,11 @@ from manim.typing import ( FunctionOverride, - Image, ManimFloat, ManimInt, MappingFunction, PathFuncType, + PixelArray, Point3D, Point3D_Array, Vector3D, @@ -825,7 +825,7 @@ def apply_over_attr_arrays(self, func: MappingFunction) -> Self: # Displaying - def get_image(self, camera=None) -> Image: + def get_image(self, camera=None) -> PixelArray: if camera is None: from ..camera.camera import Camera diff --git a/manim/typing.py b/manim/typing.py index 8111ca7398..699bbf3b41 100644 --- a/manim/typing.py +++ b/manim/typing.py @@ -77,10 +77,10 @@ "FunctionOverride", "PathFuncType", "MappingFunction", - "Image", - "GrayscaleImage", - "RGBImage", - "RGBAImage", + "PixelArray", + "GrayscalePixelArray", + "RGBPixelArray", + "RGBAPixelArray", "StrPath", "StrOrBytesPath", ] @@ -582,7 +582,7 @@ Image types """ -Image: TypeAlias = npt.NDArray[ManimInt] +PixelArray: TypeAlias = npt.NDArray[ManimInt] """``shape: (height, width) | (height, width, 3) | (height, width, 4)`` A rasterized image with a height of ``height`` pixels and a width of @@ -595,24 +595,24 @@ `RGBA_Array_Int`. """ -GrayscaleImage: TypeAlias = Image +GrayscalePixelArray: TypeAlias = PixelArray """``shape: (height, width)`` -A 100% opaque grayscale `Image`, where every pixel value is a +A 100% opaque grayscale `PixelArray`, where every pixel value is a `ManimInt` indicating its lightness (black -> gray -> white). """ -RGBImage: TypeAlias = Image +RGBPixelArray: TypeAlias = PixelArray """``shape: (height, width, 3)`` -A 100% opaque `Image` in color, where every pixel value is an +A 100% opaque `PixelArray` in color, where every pixel value is an `RGB_Array_Int` object. """ -RGBAImage: TypeAlias = Image +RGBAPixelArray: TypeAlias = PixelArray """``shape: (height, width, 4)`` -An `Image` in color where pixels can be transparent. Every pixel +A `PixelArray` in color where pixels can be transparent. Every pixel value is an `RGBA_Array_Int` object. """