Skip to content

Commit d1bc9fc

Browse files
authored
Merge branch 'experimental' into color_fix
2 parents 86c5d07 + 3713ed6 commit d1bc9fc

20 files changed

+2547
-2335
lines changed

.github/codeql.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
query-filters:
2+
- exclude:
3+
id: py/init-calls-subclass
4+
- exclude:
5+
id: py/unexpected-raise-in-special-method
6+
- exclude:
7+
id: py/modification-of-locals
8+
- exclude:
9+
id: py/multiple-calls-to-init
10+
- exclude:
11+
id: py/missing-call-to-init
12+
paths:
13+
- manim
14+
paths-ignore:
15+
- tests/
16+
- example_scenes/

.github/workflows/codeql.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
schedule:
9+
- cron: "21 16 * * 3"
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
permissions:
16+
actions: read
17+
contents: read
18+
security-events: write
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
language: [ python ]
24+
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v3
28+
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v2
31+
with:
32+
languages: ${{ matrix.language }}
33+
config-file: ./.github/codeql.yml
34+
queries: +security-and-quality
35+
36+
- name: Autobuild
37+
uses: github/codeql-action/autobuild@v2
38+
39+
- name: Perform CodeQL Analysis
40+
uses: github/codeql-action/analyze@v2
41+
with:
42+
category: "/language:${{ matrix.language }}"

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
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.10.1
16+
rev: 5.11.4
1717
hooks:
1818
- id: isort
1919
name: isort (python)

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: 2022-12-08
7+
date-released: 2022-12-26
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.17.1"
12+
version: "v0.17.2"
1313
...

docs/source/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Changelog
55

66
.. toctree::
77

8+
changelog/0.17.2-changelog
89
changelog/0.17.1-changelog
910
changelog/0.17.0-changelog
1011
changelog/0.16.0-changelog
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
*******
2+
v0.17.2
3+
*******
4+
5+
:Date: December 26, 2022
6+
7+
Contributors
8+
============
9+
10+
A total of 5 people contributed to this
11+
release. People with a '+' by their names authored a patch for the first
12+
time.
13+
14+
* CaftBotti +
15+
* Tristan Schulz
16+
* lgtm-com[bot] +
17+
18+
19+
The patches included in this release have been reviewed by
20+
the following contributors.
21+
22+
* Benjamin Hackl
23+
* Naveen M K
24+
* Tristan Schulz
25+
26+
Pull requests merged
27+
====================
28+
29+
A total of 7 pull requests were merged for this release.
30+
31+
Fixed bugs
32+
----------
33+
34+
* :pr:`3089`: Fixed OpenGL mobjects like :class:`.Surface` by reordering init calls
35+
36+
37+
Documentation-related changes
38+
-----------------------------
39+
40+
* :pr:`3073`: Fixed typo: "Whetherer" to "Whether"
41+
42+
43+
* :pr:`3074`: Fixed typo in a comment
44+
45+
46+
Code quality improvements and similar refactors
47+
-----------------------------------------------
48+
49+
* :pr:`3024`: Add CodeQL workflow for GitHub code scanning
50+
51+
52+
* :pr:`3079`: Updated CI syntax for runner version >= 2.298.2
53+
54+
55+
* :pr:`3084`: Properly setup CodeQL
56+
57+
58+
New releases
59+
------------
60+
61+
* :pr:`3090`: Prepared new Hotfix Release: ``v0.17.2``

manim/cli/render/render_options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def validate_resolution(ctx, param, value):
8383
"--resolution",
8484
callback=validate_resolution,
8585
default=None,
86-
help="Resolution in (W,H) for when 16:9 aspect ratio isn't possible.",
86+
help='Resolution in "W,H" for when 16:9 aspect ratio isn\'t possible.',
8787
),
8888
option(
8989
"--fps",

manim/mobject/graph.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -627,13 +627,11 @@ def _create_vertex(
627627
f"Vertex identifier '{vertex}' is already used for a vertex in this graph.",
628628
)
629629

630-
if isinstance(label, (Mobject, OpenGLMobject)):
631-
label = label
632-
elif label is True:
630+
if label is True:
633631
label = MathTex(vertex, fill_color=label_fill_color)
634632
elif vertex in self._labels:
635633
label = self._labels[vertex]
636-
else:
634+
elif not isinstance(label, (Mobject, OpenGLMobject)):
637635
label = None
638636

639637
base_vertex_config = copy(self.default_vertex_config)

0 commit comments

Comments
 (0)