Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows-based testing #931

Merged
merged 31 commits into from
Apr 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
aa4b848
Introduce Pipfile to handle dependencies for dev envs
Overdrivr Mar 26, 2019
3b6b9c6
Simplify appveyor script using pipenv
Overdrivr Mar 26, 2019
79fbda2
Remove sudo
Overdrivr Mar 26, 2019
2a21ba7
Add user flag when upgrading pip
Overdrivr Mar 26, 2019
9e9508e
Fix ImageMagick download
Overdrivr Mar 26, 2019
ddc5ca8
Fix ImageMagick download again
Overdrivr Mar 26, 2019
e21b130
Fix setting env vars
Overdrivr Mar 26, 2019
cd86996
Fix missing module pathlib2
Overdrivr Mar 26, 2019
5e9e4eb
Fix dir command
Overdrivr Mar 26, 2019
6d2c8d0
Add missing dev dependency
Overdrivr Mar 26, 2019
f27c5b2
Fix ImageMagick paths
Overdrivr Mar 26, 2019
4d8cfcd
Fix dir command
Overdrivr Mar 26, 2019
e01abe1
Fix dir command
Overdrivr Mar 26, 2019
6342561
Try to fix imagemagick install dir
Overdrivr Mar 26, 2019
b8090a9
Investigate image magick path not found
Overdrivr Mar 26, 2019
4e6f837
Investigate
Overdrivr Mar 26, 2019
629449f
Try to fix IMAGEMAGICK binary loading
Overdrivr Mar 26, 2019
fa22fdd
INvestigate without spaces
Overdrivr Mar 26, 2019
22b6f6d
Fix typo
Overdrivr Mar 26, 2019
f4a5625
Disable a few tests to fix Invalid Handle error when opening subproce…
Overdrivr Mar 26, 2019
d5b08f4
Replace commented tests with pytest.skip + enforce appveyor base image
Overdrivr Mar 27, 2019
6da41c4
Make builds more reproducible - avoid relying on external test data
Overdrivr Mar 27, 2019
37973a0
Merge branch 'master' into i628-windows-testing
Overdrivr Mar 27, 2019
d3556dc
Drop support for python 3.4 and add python 3.7
Overdrivr Mar 27, 2019
a2d8e1a
Fix travis build
Overdrivr Mar 27, 2019
c7d486d
Cleanup debug code
Overdrivr Mar 27, 2019
1946a24
Clean appveyor file
Overdrivr Mar 27, 2019
67a5718
Minor cleanup
Overdrivr Mar 27, 2019
1dc458f
Test on python 3.7
Overdrivr Mar 28, 2019
9f6b889
Added contributor
Overdrivr Mar 28, 2019
984e229
Update .travis.yml
Overdrivr Mar 28, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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