Skip to content

Commit 85d929a

Browse files
committed
chore(ci): tests and happy mypy
1 parent db2f27f commit 85d929a

File tree

3 files changed

+243
-193
lines changed

3 files changed

+243
-193
lines changed

manim_slides/slide/manim.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import Any, Optional
33

44
from manim import Scene, ThreeDScene, config
5-
from manim.renderer.opengl_renderer import OpenGLRenderer, OpenGLCamera
5+
from manim.renderer.opengl_renderer import OpenGLRenderer
66
from manim.utils.color import rgba_to_color
77

88
from ..config import BaseSlideConfig
@@ -18,9 +18,12 @@ class Slide(BaseSlide, Scene): # type: ignore[misc]
1818
@property
1919
def _frame_shape(self) -> tuple[float, float]:
2020
if isinstance(self.renderer, OpenGLRenderer):
21-
return self.renderer.camera.frame_shape
21+
return self.renderer.camera.frame_shape # type: ignore
2222
else:
23-
return self.renderer.camera.frame_height, self.renderer.camera.frame_width
23+
return (
24+
self.renderer.camera.frame_height,
25+
self.renderer.camera.frame_width,
26+
)
2427

2528
@property
2629
def _frame_height(self) -> float:
@@ -33,16 +36,19 @@ def _frame_width(self) -> float:
3336
@property
3437
def _background_color(self) -> str:
3538
if isinstance(self.renderer, OpenGLRenderer):
36-
return rgba_to_color(self.renderer.background_color).to_hex()
39+
return rgba_to_color(self.renderer.background_color).to_hex() # type: ignore
3740
else:
38-
return self.renderer.camera.background_color.to_hex()
41+
return self.renderer.camera.background_color.to_hex() # type: ignore
3942

4043
@property
4144
def _resolution(self) -> tuple[int, int]:
4245
if isinstance(self.renderer, OpenGLRenderer):
43-
return self.renderer.camera.get_pixel_shape()
46+
return self.renderer.get_pixel_shape() # type: ignore
4447
else:
45-
return self.renderer.camera.pixel_width, self.renderer.camera.pixel_height
48+
return (
49+
self.renderer.camera.pixel_width,
50+
self.renderer.camera.pixel_height,
51+
)
4652

4753
@property
4854
def _partial_movie_files(self) -> list[Path]:

pyproject.toml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ full-gl = [
5050
]
5151
magic = ["manim-slides[manim]", "ipython>=8.12.2"]
5252
manim = ["manim>=0.18.0"]
53-
manimgl = ["manimgl>=1.6.1;python_version<'3.12'"]
53+
manimgl = ["numpy<=1.24", "manimgl>=1.6.1"]
5454
pyqt6 = ["pyqt6>=6.6.1"]
5555
pyqt6-full = ["manim-slides[full,pyqt6]"]
5656
pyside6 = ["pyside6>=6.5.1,<6.5.3;python_version<'3.12'"]
@@ -67,11 +67,6 @@ Founding = "https://github.com/sponsors/jeertmans"
6767
Homepage = "https://github.com/jeertmans/manim-slides"
6868
Repository = "https://github.com/jeertmans/manim-slides"
6969

70-
[tool.uv]
71-
override-dependencies = [
72-
"manimpango>=0.5.0,<1.0.0"
73-
]
74-
7570
[tool.bumpversion]
7671
allow_dirty = false
7772
commit = true
@@ -198,6 +193,9 @@ extend-ignore = [
198193
extend-select = ["B", "C90", "D", "I", "N", "RUF", "UP", "T"]
199194
isort = {known-first-party = ["manim_slides", "tests"]}
200195

196+
[tool.ruff.lint.per-file-ignores]
197+
"tests/test_slide.py" = ["N801"]
198+
201199
[tool.rye]
202200
dev-dependencies = [
203201
"manim-slides[magic,manim,manimgl,pyqt6,sphinx-directive]",
@@ -222,3 +220,10 @@ dev-dependencies = [
222220
"pytest-xdist>=3.3.1",
223221
]
224222
managed = true
223+
224+
[tool.uv]
225+
override-dependencies = [
226+
# Bypass constraints from ManimGL
227+
"manimpango>=0.5.0,<1.0.0",
228+
"numpy>=0.19;python_version >= '3.12'",
229+
]

0 commit comments

Comments
 (0)