Skip to content

Commit

Permalink
Merge branch 'main' of github.com:ManimCommunity/manim into 52-fix-ty…
Browse files Browse the repository at this point in the history
…ping
  • Loading branch information
MrDiver committed Aug 11, 2023
2 parents 17ce647 + 88836df commit 747167b
Show file tree
Hide file tree
Showing 129 changed files with 6,032 additions and 2,698 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/installation_issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ assignees: ''

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

## Description of error
Expand Down
61 changes: 5 additions & 56 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,57 +13,6 @@ on:
- main

jobs:
test-arm:
runs-on: self-hosted
env:
DISPLAY: :0
PYTEST_ADDOPTS: "--color=yes" # colors in pytest
strategy:
fail-fast: false
matrix:
python: ["3.8.16", "3.11.1"]
steps:
- name: Checkout the repository
uses: actions/checkout@v3

- name: Check Runner
run: |
which latex
which ffmpeg
latex --version
ffmpeg -version
which python
python --version
- name: Activate Python ${{ matrix.python }}
run: |
echo "/root/.pyenv/versions/${{ matrix.python }}/bin:/root/.local/bin:$PATH" > $GITHUB_PATH
- name: Show Python Version
run: |
python --version --version
- name: Install Manim
run: |
poetry config virtualenvs.prefer-active-python true
poetry install
- name: Run tests
run: |
poetry run pytest
- name: Run module doctests
run: |
poetry run pytest --cov-append --doctest-modules --ignore-glob="*opengl*" manim
- name: Run doctests in rst files
run: |
cd docs && poetry run make doctest O=-tskip-manim
# upload coverage report
- name: Upload coverage
uses: codecov/codecov-action@v3

test:
runs-on: ${{ matrix.os }}
env:
Expand All @@ -81,7 +30,7 @@ jobs:

- name: Install Poetry
run: |
pipx install poetry
pipx install "poetry==1.5.*"
poetry config virtualenvs.prefer-active-python true
- name: Setup Python ${{ matrix.python }}
Expand Down Expand Up @@ -119,7 +68,7 @@ jobs:
uses: teatimeguest/setup-texlive-action@v2
with:
cache: true
packages: scheme-basic fontspec inputenc fontenc tipa mathrsfs calligra xcolor standalone preview doublestroke ms everysel setspace rsfs relsize ragged2e fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super babel-english gnu-freefont mathastext cbfonts-fd
packages: scheme-basic fontspec inputenc fontenc tipa mathrsfs calligra xcolor standalone preview doublestroke ms everysel setspace rsfs relsize ragged2e fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super babel-english gnu-freefont mathastext cbfonts-fd xetex

- name: Start virtual display (Linux)
if: runner.os == 'Linux'
Expand Down Expand Up @@ -184,7 +133,7 @@ jobs:
echo "Install Tinytex"
Invoke-WebRequest "https://github.com/yihui/tinytex-releases/releases/download/daily/TinyTeX-1.zip" -O "$($env:TMP)\TinyTex.zip"
Expand-Archive -LiteralPath "$($env:TMP)\TinyTex.zip" -DestinationPath "$($PWD)\ManimCache\LatexWindows"
$env:Path = "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32;$($env:PATH)"
$env:Path = "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\windows;$($env:PATH)"
tlmgr update --self
foreach ($c in $tinyTexPackages){
$c=$c.Trim()
Expand All @@ -196,13 +145,13 @@ jobs:
- name: Add Windows dependencies to PATH
if: runner.os == 'Windows'
run: |
$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32"
$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\windows"
$env:Path = "$env:USERPROFILE\.poetry\bin;$($env:PATH)"
echo "$env:Path" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Install manim
run: |
poetry config experimental.new-installer false
poetry config installer.modern-installation false
poetry install
- name: Run tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
platforms: linux/arm64,linux/amd64
push: true
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
print(f"tag_name={ref_tag}", file=f)
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
platforms: linux/arm64,linux/amd64
push: true
Expand Down
25 changes: 25 additions & 0 deletions .mypy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,40 @@ warn_return_any = True

[mypy-manim.typing]
ignore_errors = False

[mypy-manim.constants]
ignore_errors = False

[mypy-manim.utils.color]
ignore_errors = False

[mypy-manim.utils]
ignore_errors = False

[mypy-manim.utils.bezier]
ignore_errors = False

[mypy-manim.scene.*]
ignore_errors = True

[mypy-manim.cli.cfg.*]
ignore_errors = True

[mypy-manim.mobject.*]
ignore_errors = True

[mypy-manim._config.*]
ignore_errors = True

[mypy-manim.utils.*]
ignore_errors = True

[mypy-manim.utils.color]
ignore_errors = False

[mypy-manim.animation.*]
ignore_errors = True

# ---------------- We can't properly type this ------------------------

[mypy-manim.grpc.*]
Expand Down
17 changes: 9 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: check-toml
name: Validate Poetry
- repo: https://github.com/pycqa/isort
rev: v5.11.3
rev: 5.12.0
hooks:
- id: isort
name: isort (python)
Expand All @@ -24,27 +24,27 @@ repos:
name: isort (pyi)
types: [pyi]
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
rev: v3.10.1
hooks:
- id: pyupgrade
name: Update code to new python versions
args: [--py37-plus]
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
rev: v1.10.0
hooks:
- id: python-check-blanket-noqa
name: Precision flake ignores
- repo: https://github.com/psf/black
rev: 22.12.0
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
rev: v1.12.1
rev: 1.15.0
hooks:
- id: blacken-docs
additional_dependencies: [black==22.3.0]
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
additional_dependencies:
Expand All @@ -58,7 +58,7 @@ repos:
flake8-simplify==0.14.1,
]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.991
rev: v1.4.1
hooks:
- id: mypy
additional_dependencies:
Expand All @@ -71,7 +71,8 @@ repos:
]

- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
rev: v2.2.5
hooks:
- id: codespell
files: ^.*\.(py|md|rst)$
args: ["-L", "medias,nam"]
9 changes: 7 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
version: 2
build:
image: latest
os: ubuntu-22.04

tools:
python: "3.10"

apt_packages:
- libpango1.0-dev
- ffmpeg
- graphviz

python:
version: 3.8
install:
- requirements: docs/rtd-requirements.txt
- requirements: docs/requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ authors:
-
name: "The Manim Community Developers"
cff-version: "1.2.0"
date-released: 2022-12-08
date-released: 2023-04-06
license: MIT
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."
title: Manim – Mathematical Animation Framework
url: "https://www.manim.community/"
version: "v0.17.1"
version: "v0.17.3"
...
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,12 @@ msgstr ""

#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.begin:1:<autosummary>:1
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.is_introducer:1
msgid "Test if a the animation is an introducer."
msgid "Test if the animation is an introducer."
msgstr ""

#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.begin:1:<autosummary>:1
#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.is_remover:1
msgid "Test if a the animation is a remover."
msgid "Test if the animation is a remover."
msgstr ""

#: ../../../manim/animation/animation.py:docstring of manim.animation.animation.Animation.begin:1:<autosummary>:1
Expand Down
2 changes: 1 addition & 1 deletion docs/i18n/stripUntranslatable.awk
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BEGIN {
# The file location of where to put everything
# that has been stripped out
untranslatablefile="./untranslatable.po"
# Wether we are still reading the licence text
# Whether we are still reading the licence text
licencetext=1
}

Expand Down
Binary file added docs/source/_static/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions docs/source/_templates/autosummary/class.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Qualified name: ``{{ fullname | escape }}``
.. autoclass:: {{ objname }}
:show-inheritance:
:members:
:private-members:


{% block methods %}
{%- if methods %}
Expand Down
2 changes: 2 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Changelog

.. toctree::

changelog/0.17.3-changelog
changelog/0.17.2-changelog
changelog/0.17.1-changelog
changelog/0.17.0-changelog
changelog/0.16.0-changelog
Expand Down
61 changes: 61 additions & 0 deletions docs/source/changelog/0.17.2-changelog.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
*******
v0.17.2
*******

:Date: December 26, 2022

Contributors
============

A total of 5 people contributed to this
release. People with a '+' by their names authored a patch for the first
time.

* CaftBotti +
* Tristan Schulz
* lgtm-com[bot] +


The patches included in this release have been reviewed by
the following contributors.

* Benjamin Hackl
* Naveen M K
* Tristan Schulz

Pull requests merged
====================

A total of 7 pull requests were merged for this release.

Fixed bugs
----------

* :pr:`3089`: Fixed OpenGL mobjects like :class:`.Surface` by reordering init calls


Documentation-related changes
-----------------------------

* :pr:`3073`: Fixed typo: "Whetherer" to "Whether"


* :pr:`3074`: Fixed typo in a comment


Code quality improvements and similar refactors
-----------------------------------------------

* :pr:`3024`: Add CodeQL workflow for GitHub code scanning


* :pr:`3079`: Updated CI syntax for runner version >= 2.298.2


* :pr:`3084`: Properly setup CodeQL


New releases
------------

* :pr:`3090`: Prepared new Hotfix Release: ``v0.17.2``
Loading

0 comments on commit 747167b

Please sign in to comment.