A community-maintained Python framework for creating mathematical animations.
fix merge conflicts from tests (#133)
leotrsf24d9ef6b992
diff --cc .travis.ymlindex 8a8902e2c,327b93bef..3ad3ae1f1--- a/.travis.yml+++ b/.travis.yml@@@ -39,6 -39,11 +39,11 @@@ jobslanguage: shpython: 3.6env: PYVER="3.6.10"- before_install:++ before_install:+ - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null+ - brew install ffmpeg+ - brew cask install mactex+ - eval "$(/usr/libexec/path_helper)"install:- pip3 install --upgrade pip- pip3 install -r ./.travis/travis-requirements.txt@@@ -51,6 -56,11 +56,11 @@@language: shpython: 3.7env: PYVER="3.7.7"- before_install:++ before_install:+ - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null+ - brew install ffmpeg+ - brew cask install mactex+ - eval "$(/usr/libexec/path_helper)"install:- pip3 install --upgrade pip- pip3 install -r ./.travis/travis-requirements.txt@@@ -63,6 -73,11 +73,11 @@@language: shpython: 3.8env: PYVER="3.8.0" # Using Python 3.8.0 due to error with rich- before_install:++ before_install:+ - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null+ - brew install ffmpeg+ - brew cask install mactex+ - eval "$(/usr/libexec/path_helper)"install:- pip3 install --upgrade pip- pip3 install -r ./.travis/travis-requirements.txt@@@ -87,8 -101,8 +101,8 @@@- python ./scripts/pycairoinstall.py- cmd.exe //c "RefreshEnv.cmd"- python -m pip install --user .- script:+ script:- - python -m pytest+ - python -m pytest --skip_end_to_end -rs- os: windowslanguage: sh@@@ -104,8 -117,8 +117,8 @@@- python ./scripts/pycairoinstall.py- cmd.exe //c "RefreshEnv.cmd"- python -m pip install --user .- script:+ script:- - python -m pytest+ - python -m pytest --skip_end_to_end -rs- os: windowslanguage: sh@@@ -121,8 -133,8 +133,8 @@@- python ./scripts/pycairoinstall.py- cmd.exe //c "RefreshEnv.cmd"- python -m pip install --user .- script:+ script:- - python -m pytest+ - python -m pytest --skip_end_to_end -rsbefore_install:- if [ "$TRAVIS_OS_NAME" == "osx" ]; then chmod +x ./.travis/osx.sh; sh ./.travis/osx.sh; fidiff --cc .travis/linux.shindex 6852173fb,bbb6471e4..29ee37303--- a/.travis/linux.sh+++ b/.travis/linux.sh@@@ -2,3 -2,4 +2,4 @@@sudo apt updatesudo apt install -y ffmpeg-sudo apt-get -y install texlive texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-science texlive-fonts-extra tipa++sudo apt-get -y install texlive texlive-latex-extra texlive-fonts-extra texlive-latex-recommended texlive-science texlive-fonts-extra tipa