Skip to content

Commit

Permalink
Windows-based testing (#931)
Browse files Browse the repository at this point in the history
* Introduce Pipfile to handle dependencies for dev envs

* Simplify appveyor script using pipenv

* Remove sudo

* Add user flag when upgrading pip

* Fix ImageMagick download

* Fix ImageMagick download again

* Fix setting env vars

* Fix missing module pathlib2

* Fix dir command

* Add missing dev dependency

* Fix ImageMagick paths

* Fix dir command

* Fix dir command

* Try to fix imagemagick install dir

* Investigate image magick path not found

* Investigate

* Try to fix IMAGEMAGICK binary loading

* INvestigate without spaces

* Fix typo

* Disable a few tests to fix Invalid Handle error when opening subprocesses

* Replace commented tests with pytest.skip + enforce appveyor base image

* Make builds more reproducible - avoid relying on external test data

* Drop support for python 3.4 and add python 3.7

* Fix travis build

* Cleanup debug code

* Clean appveyor file

* Minor cleanup

* Test on python 3.7

* Added contributor

* Update .travis.yml
  • Loading branch information
Overdrivr committed Apr 1, 2019
1 parent 41d8fe0 commit 282848a
Show file tree
Hide file tree
Showing 39 changed files with 401 additions and 278 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ nosetests.xml

# Tests
tests/media
media/

# Documentation
docs/build/
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ before_install:
- sudo add-apt-repository -y ppa:kirillshkrogalev/ffmpeg-next
- sudo apt-get -y -qq update
- sudo apt-get install -y -qq ffmpeg
- mkdir media

# 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

# 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
Expand Down
14 changes: 14 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
moviepy = {editable = true, path = "."}

[dev-packages]
pytest = "*"
"pathlib2" = "*"
scandir = "*"

[requires]
243 changes: 243 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ For Windows users, before installing MoviePy by hand, go into the ``moviepy/conf
.. code:: python
IMAGEMAGICK_BINARY = "C:\\Program Files\\ImageMagick_VERSION\\magick.exe"
If you are using an older version of ImageMagick, keep in mind the name of the executable is not ``magick.exe`` but ``convert.exe``. In that case, the IMAGEMAGICK_BINARY property should be ``C:\\Program Files\\ImageMagick_VERSION\\convert.exe``

For Ubuntu 16.04LTS users, after installing MoviePy on the terminal, IMAGEMAGICK will not be detected by moviepy. This bug can be fixed. Modify the file in this directory: /etc/ImageMagick-6/policy.xml, comment out the statement <!-- <policy domain="path" rights="none" pattern="@*" /> -->.
Expand Down Expand Up @@ -230,3 +230,4 @@ Maintainers
.. _`@earney`: https://github.com/earney
.. _`@kerstin`: https://github.com/kerstin
.. _`@mbeacom`: https://github.com/mbeacom
.. _`@overdrivr`: https://github.com/overdrivr
Loading

0 comments on commit 282848a

Please sign in to comment.