Merge branch 'master' into biarne-a

.github/ISSUE_TEMPLATE.md

@@ -1,8 +1,16 @@
 <!--
-Thank you for submitting this issue! If you are not reporting a bug, please delete all of the following text.
-If you are reporting a bug, please ensure moviepy is updated to the latest version before submitting, as some bugs may only be present on older versions.
+Thank you for submitting this issue!
+If you are *not* reporting a bug, please delete all of the following text.
+If you *are* reporting a bug, please ensure that moviepy is updated to the latest version before submitting, as some bugs may only be present on older versions.
 
-You can format code by putting ``` (that's 3 backticks) on a line by itself at the beginning and end of each code block.
+You can format code by putting ``` (that's 3 backticks) on a line by itself at the beginning and end of each code block. For example:
+
+```
+from moviepy.editor import *
+
+clip = ColorClip((600, 400), color=(255, 100, 0), duration=2)
+clip.write_videofile("colorclip.mp4", fps=24)
+```
 -->
 ### Expected Behavior
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,9 @@
-<!-- Please tick when you have done these. They don't need to all be completed before the PR is created -->
-- [ ] If this is a bugfix, I have provided code that clearly demonstrates the problem and that works when used with this PR
-- [ ] I have added a test to the test suite, if necessary
-- [ ] I have properly documented new or changed features in the documention, or the docstrings
-- [ ] I have properly documented unusual changes to the code in the comments around it
-- [ ] I have made note of any breaking/backwards incompatible changes
+<!--
+Please tick when you have done these. They don't need to all be completed before the PR is submitted.
+Delete them if they are not appropriate for this pull request.
+-->
+- [ ] I have provided code that clearly demonstrates the bug and that only works correctly when applying this fix
+- [ ] I have added suitable tests demonstrating a fixed bug or new/changed feature to the test suite in `tests/`
+- [ ] I have properly documented new or changed features in the documentation or in the docstrings
+- [ ] I have properly explained unusual or unexpected code in the comments around it
+- [ ] I have formatted my code using `black -t py36` 

.github/workflows/ci.yml

@@ -0,0 +1,14 @@
+name: Code Format Check
+
+on: [pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2    
+      - name: Black Code Formatter
+        uses: lgeiger/black-action@v1.0.1    
+        with:
+          args: "--check --target-version py36 $GITHUB_WORKSPACE"

.travis.yml

@@ -1,49 +1,46 @@
-dist: trusty
-sudo: required
+dist: xenial
 language: python
 cache: pip
+os: linux
+
 python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
+  - 3.6
+  - 3.7
+  - 3.8
+
 
 before_install:
-  - sudo add-apt-repository -y ppa:kirillshkrogalev/ffmpeg-next
   - sudo apt-get -y -qq update
-  - sudo apt-get install -y -qq ffmpeg
-
+
   # Ensure PIP is up-to-date to avoid warnings.
   - python -m pip install --upgrade pip
   # Ensure setuptools is up-to-date to avoid environment_markers bug.
   - pip install --upgrade setuptools
-  # The default py that is installed is too old on some platforms, leading to version conflicts
-  - pip install --upgrade py pytest
+  # The default pytest that is installed is too old on some platforms, leading to version conflicts
+  # pytest-cov contains plugin support for checking code coverage
+  - pip install --upgrade pytest-cov
+  - pip install flake8
 
   # modify ImageMagick policy file so that Textclips work correctly.
   # `| sudo tee` replaces `>` so that it can have root permissions
-  - cat /etc/ImageMagick/policy.xml | sed 's/none/read,write/g' | sudo tee /etc/ImageMagick/policy.xml
+  - cat /etc/ImageMagick-6/policy.xml | sed 's/none/read,write/g' | sudo tee /etc/ImageMagick-6/policy.xml
 
 install:
-  - echo "No install action required. Implicitly performed by the testing."
-  - pip install flake8
+  - pip install .[test]
 
 before_script:
   # stop the build if there are Python syntax errors or undefined names
   - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics --exit-zero
   # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
-  - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+  - flake8 . --count --max-complexity=10 --max-line-length=127 --statistics --exit-zero
 
 script:
-  - python setup.py test --pytest-args "tests/ --doctest-modules -v --cov moviepy --cov-report term-missing"
+  - pytest tests/ --doctest-modules -v --cov moviepy --cov-report term-missing
   # Now the *code* is tested, let's check that the setup is compatible with PIP without falling over.
   - pip install -e .
   - pip install -e .[optional]
   - pip install -e .[test]
-  # Only test doc generation on latest. Doesn't work on some earlier versions (3.3), but doesn't matter.
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then pip install -e .[doc]; fi
+  - pip install -e .[doc]
 
 after_success:
   - coveralls
-
-matrix:
-    fast_finish: true