Skip to content

Commit cff8573

Browse files
authored
Merge branch 'main' into bump-python-unpin-av
2 parents 205a089 + 0541f9e commit cff8573

File tree

94 files changed

+2006
-1250
lines changed

Some content is hidden

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

94 files changed

+2006
-1250
lines changed

.github/codeql.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ query-filters:
1010
- exclude:
1111
id: py/missing-call-to-init
1212
- exclude:
13-
id: py/method-first-arg-is-not-self
13+
id: py/method-first-arg-is-not-self
14+
- exclude:
15+
id: py/cyclic-import
16+
- exclude:
17+
id: py/unsafe-cyclic-import
1418
paths:
1519
- manim
1620
paths-ignore:

.github/scripts/ci_build_cairo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import sys
1515
import tarfile
1616
import tempfile
17-
import typing
1817
import urllib.request
18+
from collections.abc import Generator
1919
from contextlib import contextmanager
2020
from pathlib import Path
2121
from sys import stdout
@@ -67,7 +67,7 @@ def run_command(command, cwd=None, env=None):
6767

6868

6969
@contextmanager
70-
def gha_group(title: str) -> typing.Generator:
70+
def gha_group(title: str) -> Generator:
7171
if not is_ci():
7272
yield
7373
return

.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@v4
14+
uses: actions/checkout@v5
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-22.04, macos-13, windows-latest]
25+
os: [ubuntu-22.04, macos-15-intel, windows-latest]
2626
python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
2727

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

3232
- name: Setup Python ${{ matrix.python }}
33-
uses: actions/setup-python@v5
33+
uses: actions/setup-python@v6
3434
with:
3535
python-version: ${{ matrix.python }}
3636

3737
- name: Install uv
38-
uses: astral-sh/setup-uv@v6
38+
uses: astral-sh/setup-uv@v7
3939
with:
4040
enable-cache: true
4141

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424

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

2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v3
30+
uses: github/codeql-action/init@v4
3131
with:
3232
languages: ${{ matrix.language }}
3333
config-file: ./.github/codeql.yml
3434
queries: +security-and-quality
3535

3636
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v3
37+
uses: github/codeql-action/autobuild@v4
3838

3939
- name: Perform CodeQL Analysis
40-
uses: github/codeql-action/analyze@v3
40+
uses: github/codeql-action/analyze@v4
4141
with:
4242
category: "/language:${{ matrix.language }}"

.github/workflows/python-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
id-token: write
1414

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

1818
- name: Set up Python 3.13
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: 3.13
2222

2323
- name: Install uv
24-
uses: astral-sh/setup-uv@v6
24+
uses: astral-sh/setup-uv@v7
2525

2626
- name: Build and push release to PyPI
2727
run: |
@@ -30,7 +30,7 @@ jobs:
3030
uv publish
3131
3232
- name: Store artifacts
33-
uses: actions/upload-artifact@v4
33+
uses: actions/upload-artifact@v5
3434
with:
3535
path: dist/*.tar.gz
3636
name: manim.tar.gz

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
build-and-publish-htmldocs:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313

1414
- name: Set up Python
15-
uses: actions/setup-python@v5
15+
uses: actions/setup-python@v6
1616
with:
1717
python-version: 3.13
1818

1919
- name: Install uv
20-
uses: astral-sh/setup-uv@v6
20+
uses: astral-sh/setup-uv@v7
2121

2222
- name: Install system dependencies
2323
run: |
@@ -43,7 +43,7 @@ jobs:
4343
tar -czvf ../html-docs.tar.gz *
4444
4545
- name: Store artifacts
46-
uses: actions/upload-artifact@v4
46+
uses: actions/upload-artifact@v5
4747
with:
4848
path: ${{ github.workspace }}/docs/build/html-docs.tar.gz
4949
name: html-docs.tar.gz

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fail_fast: false
33
exclude: ^(manim/grpc/gen/|docs/i18n/)
44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v5.0.0
6+
rev: v6.0.0
77
hooks:
88
- id: check-ast
99
name: Validate Python
@@ -13,7 +13,7 @@ repos:
1313
- id: check-toml
1414
name: Validate pyproject.toml
1515
- repo: https://github.com/astral-sh/ruff-pre-commit
16-
rev: v0.12.7
16+
rev: v0.14.6
1717
hooks:
1818
- id: ruff
1919
name: ruff lint
@@ -22,7 +22,7 @@ repos:
2222
- id: ruff-format
2323
types: [python]
2424
- repo: https://github.com/pre-commit/mirrors-mypy
25-
rev: v1.17.1
25+
rev: v1.18.2
2626
hooks:
2727
- id: mypy
2828
additional_dependencies:

docs/source/index.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,21 @@ or `Discord <https://www.manim.community/discord/>`_. If you're using Manim in a
9494
context, instructions on how to cite a particular release can be found
9595
`in our README <https://github.com/ManimCommunity/manim/blob/main/README.md>`_.
9696

97+
License Information
98+
-------------------
99+
100+
Manim is an open-source library licensed under the **MIT License**, which applies to both the
101+
original and the community editions of the software. This means you are free to use, modify,
102+
and distribute the code in accordance with the MIT License terms. However, there are some
103+
additional points to be aware of:
104+
105+
- **Copyrighted Assets:** Specific assets, such as the "Pi creatures" in Grant Sanderson's
106+
(3Blue1Brown) videos, are copyrighted and protected. Please avoid using these characters in
107+
any derivative works.
108+
- **Content Creation and Sharing:** Videos and animations created with Manim can be freely
109+
shared, and no attribution to Manim is required—although it is much appreciated! You are
110+
encouraged to showcase your work online and share it with the Manim community.
111+
97112
Index
98113
-----
99114

docs/source/installation/uv.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ The following commands will
153153
The name for the Python project is *manimations*, which you can change
154154
to anything you like.
155155

156+
Manim does not yet support Python 3.14 and the Python version is therefore set to 3.13.
157+
156158
```bash
157-
uv init manimations
159+
uv init --python 3.13 manimations
158160
cd manimations
159161
uv add manim
160162
```
@@ -200,8 +202,10 @@ Manim itself! The following commands will
200202
The name for the Python project is *manimations*, which you can change
201203
to anything you like.
202204

205+
Manim does not yet support Python 3.14 and the Python version is therefore set to 3.13.
206+
203207
```bash
204-
uv init manimations
208+
uv init --python 3.13 manimations
205209
cd manimations
206210
uv add manim
207211
```
@@ -253,11 +257,13 @@ As soon as the required dependencies are installed, you can create
253257
a Python project (feel free to change the name *manimations* used below
254258
to some other name) with a local environment containing Manim by running
255259
```bash
256-
uv init manimations
260+
uv init --python 3.13 manimations
257261
cd manimations
258262
uv add manim
259263
```
260264

265+
Manim does not yet support Python 3.14 and the Python version is therefore set to 3.13.
266+
261267
:::::
262268

263269
::::::

0 commit comments

Comments
 (0)