Skip to content

Commit 2cc00a9

Browse files
committed
Merge branch 'main' into bump-python-unpin-av
2 parents a944039 + a50d836 commit 2cc00a9

File tree

18 files changed

+1567
-1368
lines changed

18 files changed

+1567
-1368
lines changed

.github/workflows/cffconvert.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out a copy of the repository
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@v6
1515

1616
- name: Check whether the citation metadata from CITATION.cff is valid
1717
uses: citation-file-format/[email protected]

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu-22.04, macos-15-intel, windows-latest]
26-
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
26+
python: ["3.10", "3.11", "3.12", "3.13"]
2727

2828
steps:
2929
- name: Checkout the repository
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131

3232
- name: Setup Python ${{ matrix.python }}
3333
uses: actions/setup-python@v6

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: Initialize CodeQL
3030
uses: github/codeql-action/init@v4

.github/workflows/python-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
id-token: write
1414

1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717

1818
- name: Set up Python 3.13
1919
uses: actions/setup-python@v6

.github/workflows/release-publish-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-and-publish-htmldocs:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313

1414
- name: Set up Python
1515
uses: actions/setup-python@v6

.pre-commit-config.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,26 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: check-toml
1414
name: Validate pyproject.toml
15+
16+
- repo: https://github.com/codespell-project/codespell
17+
rev: v2.4.1
18+
hooks:
19+
- id: codespell
20+
files: ^.*\.(py|md|rst)$
21+
args: ["-L", "medias,nam"]
22+
1523
- repo: https://github.com/astral-sh/ruff-pre-commit
16-
rev: v0.14.6
24+
rev: v0.14.7
1725
hooks:
1826
- id: ruff
1927
name: ruff lint
2028
types: [python]
2129
args: [--exit-non-zero-on-fix]
2230
- id: ruff-format
2331
types: [python]
32+
2433
- repo: https://github.com/pre-commit/mirrors-mypy
25-
rev: v1.18.2
34+
rev: v1.19.0
2635
hooks:
2736
- id: mypy
2837
additional_dependencies:
@@ -34,10 +43,3 @@ repos:
3443
types-setuptools,
3544
]
3645
files: ^manim/
37-
38-
- repo: https://github.com/codespell-project/codespell
39-
rev: v2.4.1
40-
hooks:
41-
- id: codespell
42-
files: ^.*\.(py|md|rst)$
43-
args: ["-L", "medias,nam"]

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ authors:
44
-
55
name: "The Manim Community Developers"
66
cff-version: "1.2.0"
7-
date-released: 2025-01-20
7+
date-released: 2025-11-30
88
license: MIT
99
message: "We acknowledge the importance of good software to support research, and we note that research becomes more valuable when it is communicated effectively. To demonstrate the value of Manim, we ask that you cite Manim in your work."
1010
title: Manim – Mathematical Animation Framework
1111
url: "https://www.manim.community/"
12-
version: "v0.19.0"
12+
version: "v0.19.1"
1313
...

manim/cli/init/commands.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ def select_resolution() -> tuple[int, int]:
4343
tuple[int, int]
4444
Tuple containing height and width.
4545
"""
46-
resolution_options: list[tuple[int, int]] = []
47-
for quality in QUALITIES.items():
48-
resolution_options.append(
49-
(quality[1]["pixel_height"], quality[1]["pixel_width"]),
50-
)
46+
resolution_options: list[tuple[int, int]] = [
47+
(quality[1]["pixel_height"], quality[1]["pixel_width"])
48+
for quality in QUALITIES.items()
49+
]
5150
resolution_options.pop()
5251
choice = click.prompt(
5352
"\nSelect resolution:\n",

manim/mobject/geometry/boolean_ops.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ def __init__(self, *vmobjects: VMobject, **kwargs: Any) -> None:
182182
if len(vmobjects) < 2:
183183
raise ValueError("At least 2 mobjects needed for Union.")
184184
super().__init__(**kwargs)
185-
paths = []
186-
for vmobject in vmobjects:
187-
paths.append(self._convert_vmobject_to_skia_path(vmobject))
185+
paths = [
186+
self._convert_vmobject_to_skia_path(vmobject) for vmobject in vmobjects
187+
]
188188
outpen = SkiaPath()
189189
union(paths, outpen.getPen())
190190
self._convert_skia_path_to_vmobject(outpen)

manim/mobject/graph.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,10 +1021,7 @@ def _add_edge(
10211021
"""
10221022
if edge_config is None:
10231023
edge_config = self.default_edge_config.copy()
1024-
added_mobjects = []
1025-
for v in edge:
1026-
if v not in self.vertices:
1027-
added_mobjects.append(self._add_vertex(v))
1024+
added_mobjects = [self._add_vertex(v) for v in edge if v not in self.vertices]
10281025
u, v = edge
10291026

10301027
self._graph.add_edge(u, v)

0 commit comments

Comments
 (0)