Skip to content

Commit

Permalink
Revert "Merge branch 'main' of https://github.com/ManimCommunity/manim"
Browse files Browse the repository at this point in the history
This reverts commit e7f9d23, reversing
changes made to afe91d0.
  • Loading branch information
Darylgolden committed Jul 31, 2023
1 parent e7f9d23 commit 6018ebf
Show file tree
Hide file tree
Showing 466 changed files with 9,887 additions and 19,638 deletions.
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[codespell]
exclude-file=.codespell_ignorelines
check-hidden=True
ignore-words-list = nam,sherif,falsy
ignore-words-list = sherif
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extend-ignore = E203, W503, D202, D212, D213, D404
A001, A002, A003,

# Plug-in: flake8-bugbear
B006, B007, B008, B009, B010, B903, B950,
B006, B007, B008, B009, B010,

# Plug-in: flake8-simplify
SIM105, SIM106, SIM119,
Expand Down
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 [installation FAQ](https://docs.manim.community/en/stable/faq/installation.html) and my problem is either not mentioned there,
- [ ] I have checked the [troubleshooting page](https://docs.manim.community/en/stable/installation/troubleshooting.html) and my problem is either not mentioned there,
or the solution given there does not help.

## Description of error
Expand Down
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/suggestion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Suggestion
about: Make a suggestion for the enhancement of existing features
title: ""
labels: enhancement
assignees: ''

---

## Enhancement proposal
<!-- Add a clear and concise description of your enhancement proposal. In particular,
if your enhancement introduces changes to the API, illustrate them with
(fictional) code examples. -->


## Additional comments
<!-- Add further context that you think might be relevant. -->
16 changes: 0 additions & 16 deletions .github/codeql.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/cffconvert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out a copy of the repository
uses: actions/checkout@v3
uses: actions/checkout@v2

- name: Check whether the citation metadata from CITATION.cff is valid
uses: citation-file-format/[email protected]
Expand Down
123 changes: 88 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,77 @@ 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.7.12', '3.10.2']
steps:
- name: Checkout the repository
uses: actions/checkout@v2

- 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/.poetry/bin:$PATH" > $GITHUB_PATH
- name: Show Python Version
run: |
python --version --version
- name: Install Manim
run: |
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 && pip install -r requirements.txt && poetry run make doctest O=-tskip-manim
test:
runs-on: ${{ matrix.os }}
env:
DISPLAY: :0
PYTEST_ADDOPTS: "--color=yes" # colors in pytest
GLCONTEXT_WIN_LIBGL: C:\msys64\mingw64\bin\opengl32.dll
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-latest, windows-latest]
python: ["3.8", "3.9", "3.10", "3.11"]
os: [ubuntu-latest, macos-latest, windows-latest]
python: ['3.7', '3.8', '3.9', '3.10']

steps:
- name: Checkout the repository
uses: actions/checkout@v3

- name: Install Poetry
run: |
pipx install "poetry==1.5.*"
poetry config virtualenvs.prefer-active-python true
uses: actions/checkout@v2

- name: Setup Python ${{ matrix.python }}
uses: actions/setup-python@v4
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
cache: "poetry"

- name: Install Poetry
run: |
pip install --user poetry
- name: Setup macOS PATH
if: runner.os == 'macOS'
Expand All @@ -48,38 +94,33 @@ jobs:
shell: bash
id: cache-vars
run: |
echo "date=$(/bin/date -u "+%m%w%Y")" >> $GITHUB_OUTPUT
echo "::set-output name=poetry-venv-dir::$(poetry config virtualenvs.path)"
echo "::set-output name=date::$(/bin/date -u "+%m%w%Y")"
- name: Setup Poetry cache
uses: actions/cache@v2
with:
path: ${{ steps.cache-vars.outputs.poetry-venv-dir }}
key: ${{ runner.os }}-poetry-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}

- name: Install and cache ffmpeg (all OS)
uses: FedericoCarboni/setup-ffmpeg@v2
uses: FedericoCarboni/setup-ffmpeg@v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
id: setup-ffmpeg

- name: Install system dependencies (Linux)
if: runner.os == 'Linux'
uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: python3-opengl libpango1.0-dev xvfb
version: 1.0

- name: Install Texlive (Linux)
if: runner.os == 'Linux'
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 xetex

- name: Start virtual display (Linux)
if: runner.os == 'Linux'
run: |
sudo apt update
sudo apt-get -y install texlive texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-science texlive-fonts-extra tipa python-opengl libpango1.0-dev xvfb
# start xvfb in background
sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 &
- name: Setup macOS cache
uses: actions/cache@v3
id: cache-macos
if: runner.os == 'macOS'
uses: actions/cache@v2
with:
path: ${{ github.workspace }}/macos-cache
key: ${{ runner.os }}-dependencies-tinytex-${{ hashFiles('.github/manimdependency.json') }}-${{ steps.cache-vars.outputs.date }}-1
Expand Down Expand Up @@ -118,12 +159,20 @@ jobs:
- name: Setup Windows cache
id: cache-windows
if: runner.os == 'Windows'
uses: actions/cache@v3
uses: actions/cache@v2
with:
path: ${{ github.workspace }}\ManimCache
key: ${{ runner.os }}-dependencies-tinytex-${{ hashFiles('.github/manimdependency.json') }}-${{ steps.cache-vars.outputs.date }}-1

- uses: ssciwr/setup-mesa-dist-win@v1
- name: Setup MSYS2 (Windows)
if: runner.os == 'Windows'
uses: msys2/setup-msys2@v2
with:
release: false
msystem: MINGW64
path-type: inherit
install: >-
mingw-w64-x86_64-mesa
- name: Install system dependencies (Windows)
if: runner.os == 'Windows' && steps.cache-windows.outputs.cache-hit != 'true'
Expand All @@ -133,7 +182,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\windows;$($env:PATH)"
$env:Path = "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32;$($env:PATH)"
tlmgr update --self
foreach ($c in $tinyTexPackages){
$c=$c.Trim()
Expand All @@ -145,23 +194,27 @@ jobs:
- name: Add Windows dependencies to PATH
if: runner.os == 'Windows'
run: |
$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\windows"
$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32"
$env:Path = "$env:USERPROFILE\.poetry\bin;$($env:PATH)"
$env:PATH = "C:\msys64\mingw64\bin;$($env:PATH)"
echo "$env:Path" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Install manim
run: |
poetry config installer.modern-installation false
poetry config experimental.new-installer false
poetry install
- name: Run tests
run: |
poetry run python -m pytest
poetry run pytest
- name: Run module doctests
run: |
poetry run python -m pytest -v --cov-append --ignore-glob="*opengl*" --doctest-modules manim
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
cd docs && pip install -r requirements.txt && poetry run make doctest O=-tskip-manim
- name: Upload coverage
uses: codecov/codecov-action@v1
42 changes: 0 additions & 42 deletions .github/workflows/codeql.yml

This file was deleted.

72 changes: 0 additions & 72 deletions .github/workflows/publish-docker.yml

This file was deleted.

Loading

0 comments on commit 6018ebf

Please sign in to comment.