Skip to content

Commit 695373b

Browse files
committed
Merge remote-tracking branch 'origin/main' into color_fix
2 parents 6499b86 + 117563e commit 695373b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+690
-221
lines changed

.github/ISSUE_TEMPLATE/installation_issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ assignees: ''
1111

1212
- [ ] I have followed the latest version of the
1313
[installation instructions](https://docs.manim.community/en/stable/installation.html).
14-
- [ ] I have checked the [troubleshooting page](https://docs.manim.community/en/stable/installation/troubleshooting.html) and my problem is either not mentioned there,
14+
- [ ] I have checked the [installation FAQ](https://docs.manim.community/en/stable/faq/installation.html) and my problem is either not mentioned there,
1515
or the solution given there does not help.
1616

1717
## Description of error

.github/workflows/ci.yml

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,57 +13,6 @@ on:
1313
- main
1414

1515
jobs:
16-
test-arm:
17-
runs-on: self-hosted
18-
env:
19-
DISPLAY: :0
20-
PYTEST_ADDOPTS: "--color=yes" # colors in pytest
21-
strategy:
22-
fail-fast: false
23-
matrix:
24-
python: ["3.8.16", "3.11.1"]
25-
steps:
26-
- name: Checkout the repository
27-
uses: actions/checkout@v3
28-
29-
- name: Check Runner
30-
run: |
31-
which latex
32-
which ffmpeg
33-
latex --version
34-
ffmpeg -version
35-
which python
36-
python --version
37-
38-
- name: Activate Python ${{ matrix.python }}
39-
run: |
40-
echo "/root/.pyenv/versions/${{ matrix.python }}/bin:/root/.local/bin:$PATH" > $GITHUB_PATH
41-
42-
- name: Show Python Version
43-
run: |
44-
python --version --version
45-
46-
- name: Install Manim
47-
run: |
48-
poetry config virtualenvs.prefer-active-python true
49-
poetry install
50-
51-
- name: Run tests
52-
run: |
53-
poetry run pytest
54-
55-
- name: Run module doctests
56-
run: |
57-
poetry run pytest --cov-append --doctest-modules --ignore-glob="*opengl*" manim
58-
59-
- name: Run doctests in rst files
60-
run: |
61-
cd docs && poetry run make doctest O=-tskip-manim
62-
63-
# upload coverage report
64-
- name: Upload coverage
65-
uses: codecov/codecov-action@v3
66-
6716
test:
6817
runs-on: ${{ matrix.os }}
6918
env:
@@ -184,7 +133,7 @@ jobs:
184133
echo "Install Tinytex"
185134
Invoke-WebRequest "https://github.com/yihui/tinytex-releases/releases/download/daily/TinyTeX-1.zip" -O "$($env:TMP)\TinyTex.zip"
186135
Expand-Archive -LiteralPath "$($env:TMP)\TinyTex.zip" -DestinationPath "$($PWD)\ManimCache\LatexWindows"
187-
$env:Path = "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32;$($env:PATH)"
136+
$env:Path = "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\windows;$($env:PATH)"
188137
tlmgr update --self
189138
foreach ($c in $tinyTexPackages){
190139
$c=$c.Trim()
@@ -196,7 +145,7 @@ jobs:
196145
- name: Add Windows dependencies to PATH
197146
if: runner.os == 'Windows'
198147
run: |
199-
$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32"
148+
$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\windows"
200149
$env:Path = "$env:USERPROFILE\.poetry\bin;$($env:PATH)"
201150
echo "$env:Path" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
202151

.pre-commit-config.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: check-toml
1414
name: Validate Poetry
1515
- repo: https://github.com/pycqa/isort
16-
rev: 5.11.4
16+
rev: 5.12.0
1717
hooks:
1818
- id: isort
1919
name: isort (python)
@@ -30,16 +30,16 @@ repos:
3030
name: Update code to new python versions
3131
args: [--py37-plus]
3232
- repo: https://github.com/pre-commit/pygrep-hooks
33-
rev: v1.9.0
33+
rev: v1.10.0
3434
hooks:
3535
- id: python-check-blanket-noqa
3636
name: Precision flake ignores
3737
- repo: https://github.com/psf/black
38-
rev: 22.12.0
38+
rev: 23.1.0
3939
hooks:
4040
- id: black
4141
- repo: https://github.com/asottile/blacken-docs
42-
rev: v1.12.1
42+
rev: 1.13.0
4343
hooks:
4444
- id: blacken-docs
4545
additional_dependencies: [black==22.3.0]
@@ -58,7 +58,7 @@ repos:
5858
flake8-simplify==0.14.1,
5959
]
6060
- repo: https://github.com/pre-commit/mirrors-mypy
61-
rev: v0.991
61+
rev: v1.1.1
6262
hooks:
6363
- id: mypy
6464
additional_dependencies:
@@ -71,7 +71,8 @@ repos:
7171
]
7272

7373
- repo: https://github.com/codespell-project/codespell
74-
rev: v2.2.2
74+
rev: v2.2.4
7575
hooks:
7676
- id: codespell
77+
files: ^.*\.(py|md|rst)$
7778
args: ["-L", "medias,nam"]

docs/i18n/gettext/reference/manim.animation.animation.Animation.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ msgstr ""
171171

172172
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.begin:1:<autosummary>:1
173173
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.is_introducer:1
174-
msgid "Test if a the animation is an introducer."
174+
msgid "Test if the animation is an introducer."
175175
msgstr ""
176176

177177
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.begin:1:<autosummary>:1
178178
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.is_remover:1
179-
msgid "Test if a the animation is a remover."
179+
msgid "Test if the animation is a remover."
180180
msgstr ""
181181

182182
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.begin:1:<autosummary>:1

docs/i18n/stripUntranslatable.awk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ BEGIN {
2525
# The file location of where to put everything
2626
# that has been stripped out
2727
untranslatablefile="./untranslatable.po"
28-
# Wether we are still reading the licence text
28+
# Whether we are still reading the licence text
2929
licencetext=1
3030
}
3131

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138

139139
# external links
140140
extlinks = {
141-
"issue": ("https://github.com/ManimCommunity/manim/issues/%s", "#"),
142-
"pr": ("https://github.com/ManimCommunity/manim/pull/%s", "#"),
141+
"issue": ("https://github.com/ManimCommunity/manim/issues/%s", "#%s"),
142+
"pr": ("https://github.com/ManimCommunity/manim/pull/%s", "#%s"),
143143
}
144144

145145
# opengraph settings

manim/animation/animation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ def set_name(self, name: str) -> Animation:
457457
return self
458458

459459
def is_remover(self) -> bool:
460-
"""Test if a the animation is a remover.
460+
"""Test if the animation is a remover.
461461
462462
Returns
463463
-------
@@ -467,7 +467,7 @@ def is_remover(self) -> bool:
467467
return self.remover
468468

469469
def is_introducer(self) -> bool:
470-
"""Test if a the animation is an introducer.
470+
"""Test if the animation is an introducer.
471471
472472
Returns
473473
-------
@@ -528,8 +528,8 @@ class Wait(Animation):
528528
stop_condition
529529
A function without positional arguments that evaluates to a boolean.
530530
The function is evaluated after every new frame has been rendered.
531-
Playing the animation only stops after the return value is truthy.
532-
Overrides the specified ``run_time``.
531+
Playing the animation stops after the return value is truthy, or
532+
after the specified ``run_time`` has passed.
533533
frozen_frame
534534
Controls whether or not the wait animation is static, i.e., corresponds
535535
to a frozen frame. If ``False`` is passed, the render loop still

manim/animation/creation.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def construct(self):
301301
302302
class ShowWriteReversed(Scene):
303303
def construct(self):
304-
self.play(Write(Text("Hello", font_size=144), reverse=True))
304+
self.play(Write(Text("Hello", font_size=144), reverse=True, remover=False))
305305
306306
Tests
307307
-----
@@ -404,7 +404,6 @@ def __init__(
404404
reverse: bool = True,
405405
**kwargs,
406406
) -> None:
407-
408407
run_time: float | None = kwargs.pop("run_time", None)
409408
lag_ratio: float | None = kwargs.pop("lag_ratio", None)
410409
run_time, lag_ratio = self._set_default_config_from_length(

manim/animation/speedmodifier.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def __init__(
9797
affects_speed_updaters: bool = True,
9898
**kwargs,
9999
) -> None:
100-
101100
if issubclass(type(anim), AnimationGroup):
102101
self.anim = type(anim)(
103102
*map(self.setup, anim.animations),

manim/animation/transform.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,7 @@ def create_target(self) -> Mobject:
211211
def clean_up_from_scene(self, scene: Scene) -> None:
212212
super().clean_up_from_scene(scene)
213213
if self.replace_mobject_with_target_in_scene:
214-
scene.remove(self.mobject)
215-
scene.add(self.target_mobject)
214+
scene.replace(self.mobject, self.target_mobject)
216215

217216
def get_all_mobjects(self) -> Sequence[Mobject]:
218217
return [

manim/animation/transform_matching_parts.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def __init__(
7676
key_map: dict | None = None,
7777
**kwargs,
7878
):
79-
8079
if isinstance(mobject, OpenGLVMobject):
8180
group_type = OpenGLVGroup
8281
elif isinstance(mobject, OpenGLMobject):

manim/camera/mapping_camera.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def capture_mobjects(self, mobjects, **kwargs):
6464
# TODO: Add optional separator borders between cameras (or perhaps peel this off into a
6565
# CameraPlusOverlay class)
6666

67+
6768
# TODO, the classes below should likely be deleted
6869
class OldMultiCamera(Camera):
6970
def __init__(self, *cameras_with_start_positions, **kwargs):

manim/camera/three_d_camera.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ def capture_mobjects(self, mobjects, **kwargs):
8585
super().capture_mobjects(mobjects, **kwargs)
8686

8787
def get_value_trackers(self):
88-
"""Returns list of ValueTrackers of phi, theta, focal_distance and gamma
88+
"""A list of :class:`ValueTrackers <.ValueTracker>` of phi, theta, focal_distance,
89+
gamma and zoom.
8990
9091
Returns
9192
-------
@@ -380,6 +381,7 @@ def add_fixed_orientation_mobjects(
380381
The function which returns the centerpoint
381382
with respect to which the mobject will be oriented, by default None
382383
"""
384+
383385
# This prevents the computation of mobject.get_center
384386
# every single time a projection happens
385387
def get_static_center_func(mobject):

0 commit comments

Comments
 (0)