Skip to content

Commit ff98718

Browse files
committed
Merge branch 'master' of https://github.com/manimcommunity/manim into pango-text
2 parents 58469dc + c60b8ef commit ff98718

File tree

10 files changed

+52
-17
lines changed

10 files changed

+52
-17
lines changed

.github/workflows/python-publish.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
1-
name: Upload Python Package
1+
name: Publish Release
22

33
on:
44
release:
5-
types:
6-
- created
5+
types: [released]
6+
77
jobs:
8-
build:
8+
release:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
#TODO: Set an API key from PyPI `PYPI_API_KEY` in secrets tab.
13-
- name: Build and publish to pypi
14-
uses: JRubics/poetry-publish@v1
12+
13+
- name: Set up Python 3.8
14+
uses: actions/setup-python@v2
1515
with:
16-
pypi_token: ${{ secrets.PYPI_API_KEY }}
16+
python-version: 3.8
17+
18+
- name: Install dependencies
19+
run: python -m pip install --upgrade poetry
20+
21+
# TODO: Set PYPI_API_TOKEN to api token from pip in secrets
22+
- name: Configure pypi credentials
23+
env:
24+
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
25+
run: poetry config http-basic.pypi __token__ "$PYPI_API_TOKEN"
26+
27+
- name: Publish release to pypi
28+
run: poetry publish --build

manim/animation/specialized.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from ..mobject.types.vectorized_mobject import VGroup
1414
from ..utils.config_ops import digest_config
1515
from ..utils.space_ops import get_norm
16-
from ..utils.color import BLACK, WHITE
16+
from ..utils.color import BLACK, WHITE
1717

1818

1919
class MoveCar(ApplyMethod):

manim/mobject/changing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from ..mobject.types.vectorized_mobject import VGroup
88
from ..utils.rate_functions import smooth
99
from ..utils.space_ops import get_norm
10-
from ..utils.color import BLUE_D, BLUE_B, BLUE_E, GREY_BROWN, WHITE
10+
from ..utils.color import BLUE_D, BLUE_B, BLUE_E, GREY_BROWN, WHITE
1111

1212

1313
class AnimatedBoundary(VGroup):

manim/mobject/frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from ..constants import *
1313
from ..mobject.geometry import Rectangle
1414
from ..utils.config_ops import digest_config
15-
from ..utils.color import BLACK
15+
from ..utils.color import BLACK
1616

1717

1818
class ScreenRectangle(Rectangle):

manim/mobject/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from ..constants import *
88
from ..mobject.types.vectorized_mobject import VMobject
99
from ..utils.config_ops import digest_config
10-
from ..utils.color import YELLOW
10+
from ..utils.color import YELLOW
1111

1212
import math
1313

manim/mobject/number_line.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from ..utils.config_ops import merge_dicts_recursively
1717
from ..utils.simple_functions import fdiv
1818
from ..utils.space_ops import normalize
19-
from ..utils.color import LIGHT_GREY
19+
from ..utils.color import LIGHT_GREY
2020

2121

2222
class NumberLine(Line):

manim/mobject/probability.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@
1111
from ..mobject.svg.tex_mobject import MathTex
1212
from ..mobject.svg.tex_mobject import Tex
1313
from ..mobject.types.vectorized_mobject import VGroup
14-
from ..utils.color import color_gradient, DARK_GREY, LIGHT_GREY, GREEN_E, BLUE_E, MAROON_B, YELLOW, BLUE
14+
from ..utils.color import (
15+
color_gradient,
16+
DARK_GREY,
17+
LIGHT_GREY,
18+
GREEN_E,
19+
BLUE_E,
20+
MAROON_B,
21+
YELLOW,
22+
BLUE,
23+
)
1524
from ..utils.iterables import tuplify
1625

1726
EPSILON = 0.0001

manim/mobject/svg/drawings.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,19 @@
5555
from ...utils.space_ops import angle_of_vector
5656
from ...utils.space_ops import complex_to_R3
5757
from ...utils.space_ops import rotate_vector
58-
from ...utils.color import YELLOW, WHITE, DARK_GREY, MAROON_B, PURPLE, GREEN, BLACK, LIGHT_GREY, GREY, BLUE_B, BLUE_D
58+
from ...utils.color import (
59+
YELLOW,
60+
WHITE,
61+
DARK_GREY,
62+
MAROON_B,
63+
PURPLE,
64+
GREEN,
65+
BLACK,
66+
LIGHT_GREY,
67+
GREY,
68+
BLUE_B,
69+
BLUE_D,
70+
)
5971

6072

6173
class Lightbulb(SVGMobject):

manim/mobject/three_dimensions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from ..mobject.types.vectorized_mobject import VMobject
99
from ..utils.iterables import tuplify
1010
from ..utils.space_ops import z_to_vector
11-
from ..utils.color import BLUE_D, BLUE , BLUE_E , LIGHT_GREY
11+
from ..utils.color import BLUE_D, BLUE, BLUE_E, LIGHT_GREY
1212

1313
##############
1414

tests/test_color.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import pytest
22
from manim import Camera, tempconfig, config
33

4+
45
def test_import_color():
56
import manim.utils.color as C
6-
C.WHITE
7+
8+
C.WHITE

0 commit comments

Comments
 (0)