mirror of
https://github.com/jeertmans/manim-slides.git
synced 2025-08-06 06:12:56 +08:00
chore(deps): bump ManimGL to 1.7.1 (#499)
* chore(deps): bump ManimGL to 1.7.1 Bump ManimGL's minimal version, so relax constraints on other deps and remove compatibility issues with Manim * fix(docs): correct PR number * fix(lib): update ManimGL's init See https://github.com/3b1b/manim/issues/2261 * fix(lib): force float * chore(tests): correctly ignore warning * fix(tests) * fix(tests): add skips * chore(fmt): auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix(tests) * oops * fix on 3.12 * fix(lib): correctly patch ManimGL * fix(deps): pyrr issue * fix: version --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
@ -26,23 +26,32 @@ from manim_slides.defaults import FOLDER_PATH
|
||||
from manim_slides.render import render
|
||||
from manim_slides.slide.manim import Slide as CESlide
|
||||
|
||||
if sys.version_info < (3, 10):
|
||||
|
||||
class _GLSlide:
|
||||
def construct(self) -> None:
|
||||
pass
|
||||
|
||||
def render(self) -> None:
|
||||
pass
|
||||
|
||||
GLSlide = pytest.param(
|
||||
_GLSlide,
|
||||
marks=pytest.mark.skip(reason="See https://github.com/3b1b/manim/issues/2263"),
|
||||
)
|
||||
else:
|
||||
from manim_slides.slide.manimlib import Slide as GLSlide
|
||||
|
||||
_GLSlide = GLSlide
|
||||
|
||||
|
||||
class CEGLSlide(CESlide):
|
||||
def __init__(self, *args: Any, **kwargs: Any) -> None:
|
||||
super().__init__(*args, renderer=OpenGLRenderer(), **kwargs)
|
||||
|
||||
|
||||
if sys.version_info >= (3, 12):
|
||||
|
||||
class _GLSlide:
|
||||
pass
|
||||
|
||||
GLSlide = pytest.param(_GLSlide, marks=pytest.mark.skip())
|
||||
else:
|
||||
from manim_slides.slide.manimlib import Slide as GLSlide
|
||||
|
||||
SlideType = Union[type[CESlide], type[GLSlide], type[CEGLSlide]]
|
||||
Slide = Union[CESlide, GLSlide, CEGLSlide]
|
||||
SlideType = Union[type[CESlide], type[_GLSlide], type[CEGLSlide]]
|
||||
Slide = Union[CESlide, _GLSlide, CEGLSlide]
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@ -52,8 +61,8 @@ Slide = Union[CESlide, GLSlide, CEGLSlide]
|
||||
pytest.param(
|
||||
"--GL",
|
||||
marks=pytest.mark.skipif(
|
||||
sys.version_info >= (3, 12),
|
||||
reason="ManimGL requires numpy<1.25, which is outdated and Python < 3.12",
|
||||
sys.version_info < (3, 10),
|
||||
reason="See https://github.com/3b1b/manim/issues/2263.",
|
||||
),
|
||||
),
|
||||
],
|
||||
@ -161,8 +170,8 @@ def test_clear_cache(
|
||||
pytest.param(
|
||||
"--GL",
|
||||
marks=pytest.mark.skipif(
|
||||
sys.version_info >= (3, 12),
|
||||
reason="ManimGL requires numpy<1.25, which is outdated and Python < 3.12",
|
||||
sys.version_info < (3, 10),
|
||||
reason="See https://github.com/3b1b/manim/issues/2263.",
|
||||
),
|
||||
),
|
||||
],
|
||||
|
Reference in New Issue
Block a user