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

CHANGELOG.md

@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 (unreleased)=
 ## [Unreleased](https://github.com/jeertmans/manim-slides/compare/v5.1.10...HEAD)
 
+(unreleased-chore)=
+### Chore
+
+- Bump ManimGL to `>=1.7.1`, to remove conflicting dependencies
+  with Manim's.
+  [#498](https://github.com/jeertmans/manim-slides/pull/498)
+
 (v5.1.10)=
 ## [v5.1.10](https://github.com/jeertmans/manim-slides/compare/v5.1.9...v5.1.10)
 

docs/source/faq.md

@@ -29,13 +29,8 @@ ManimGL support is only guaranteed to work
 on a very minimal set of versions, because it differs quite a lot from ManimCE,
 and its development is not very active.
 
-The typical issues are that (1) ManimGL needs an outdated NumPy version
-and (2) ManimGL **should not** be installed from the GitHub repository,
-at least not from the `main` branch, but from a version released to PyPI.
-
-To solve the NumPy issue, you can safely downgrade NumPy to a version supported
-by ManimGL,
-while ignoring the possible *conflicting dependencies* messages from `pip` (or else).
+The typical issue is that ManimGL `<1.7.1` needs an outdated NumPy version, but
+can be resolved by manually downgrading NumPy, or upgrading ManimGL (**recommended**).
 
 ### Presenting
 

docs/source/installation.md

@@ -29,19 +29,6 @@ please refer to their specific installation guidelines:
 - [Manim](https://docs.manim.community/en/stable/installation.html)
 - [ManimGL](https://3b1b.github.io/manim/getting_started/installation.html)
 
-:::{warning}
-If you install Manim from its git repository, as suggested by ManimGL,
-make sure to first check out a supported version (e.g., `git checkout tags/v1.6.1`
-for ManimGL), otherwise it might install an unsupported version of Manim!
-See [#314](https://github.com/jeertmans/manim-slides/issues/314).
-
-Also, note that ManimGL uses outdated dependencies, and may
-not work out-of-the-box. One example is NumPy: ManimGL
-does not specify any restriction on this package, but
-only `numpy<1.25` will work, see
-[#2053](https://github.com/3b1b/manim/issues/2053).
-:::
-
 <!-- end deps -->
 
 ## Pip Install

pyproject.toml

@@ -59,7 +59,7 @@ full = [
 ]
 magic = ["manim-slides[manim]", "ipython>=8.12.2"]
 manim = ["manim>=0.18.0"]
-manimgl = ["manimgl>=1.6.1;python_version<'3.12'"]
+manimgl = ["manimgl>=1.7.1"]
 pyqt6 = ["pyqt6>=6.7.0"]
 pyqt6-full = ["manim-slides[full,pyqt6]"]
 pyside6 = ["pyside6>=6.6.1"]
@@ -227,9 +227,3 @@ dev-dependencies = [
   "pre-commit>=3.5.0",
   "setuptools>=73.0.1",
 ]
-override-dependencies = [
-  # Bypass constraints from ManimGL
-  "manimpango>=0.5.0,<1.0.0",
-  "numpy<=1.24;python_version < '3.12'",
-  "numpy>=1.26;python_version >= '3.12'",
-]

tests/test_slide.py

@@ -1,6 +1,5 @@
 import random
 import shutil
-import sys
 from pathlib import Path
 from typing import Any, Union
 
@@ -25,22 +24,14 @@
 from manim_slides.defaults import FOLDER_PATH
 from manim_slides.render import render
 from manim_slides.slide.manim import Slide as CESlide
+from manim_slides.slide.manimlib import Slide as 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]
 
@@ -49,13 +40,7 @@ class _GLSlide:
     "renderer",
     [
         "--CE",
-        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",
-            ),
-        ),
+        "--GL",
     ],
 )
 def test_render_basic_slide(
@@ -158,13 +143,7 @@ def test_clear_cache(
     "renderer",
     [
         "--CE",
-        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",
-            ),
-        ),
+        "--GL",
     ],
 )
 @pytest.mark.parametrize(