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

Make gallery fixes go live on github.io web-site. #700

Closed
wants to merge 666 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
666 commits
Select commit Hold shift + click to select a range
01f207a
`Colorclip` changed `col`>`color` (#424)
Mar 2, 2017
a152c52
add ImageSequenceClip tests (#456)
bearney74 Mar 2, 2017
adcbcca
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 2, 2017
cadfd83
change ColorClips col argument to color in tests
bearney74 Mar 2, 2017
e34716c
Merge branch 'master' of https://github.com/Zulko/moviepy
tburrows13 Mar 2, 2017
436ffc9
modify tests to use ColorClip's new color argument (instead of col) (…
bearney74 Mar 2, 2017
3c1ae1a
Merge pull request #380 from wingillis/master
Mar 2, 2017
660b20e
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 2, 2017
c9135a3
remove double spaces
bearney74 Mar 2, 2017
6a17cf9
Merge branch 'master' of https://github.com/Zulko/moviepy
tburrows13 Mar 2, 2017
733d3e2
Added `progress_bar` option to `write_audiofile`
tburrows13 Mar 3, 2017
c59941c
Added test
tburrows13 Mar 3, 2017
0298805
update test_PR.py, add fps argument to write_videofile
bearney74 Mar 3, 2017
813d698
remove empty lines
bearney74 Mar 3, 2017
8622ecc
remove empty lines
bearney74 Mar 3, 2017
85a5564
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 3, 2017
d426ee0
remove empty lines
bearney74 Mar 3, 2017
f71ade9
add tests for Colorclip width and height (size)
bearney74 Mar 3, 2017
6530f5b
add testing to verify the width,height (size) are correct. (#459)
bearney74 Mar 3, 2017
a966126
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 3, 2017
1fb79c1
Merge pull request #446 from kerstin/fix_yt_objects
kerstin Mar 3, 2017
d0d44b7
FAQ.rst use https (+ whitespace changes)
kerstin Mar 5, 2017
83c55ae
gallery.rst use https
kerstin Mar 5, 2017
e7a21c8
clips.rst use https (+ whitespace changes)
kerstin Mar 5, 2017
0fa9110
quick_presentation.rst use https (+ whitespace changes)
kerstin Mar 5, 2017
c340af7
index.rst use https
kerstin Mar 5, 2017
cabc4cc
videoclips.rst use https (+ whitespace changes)
kerstin Mar 5, 2017
0afd246
install.rst use https
kerstin Mar 5, 2017
fe742ad
Merge pull request #462 from kerstin/fix_mixed_content
kerstin Mar 5, 2017
9ba01d9
comment gitignore
kerstin Mar 5, 2017
79a5404
videofx.rst fix spliced paragraph
kerstin Mar 5, 2017
bc8dd55
conf.py formatting
kerstin Mar 5, 2017
6b71d9a
makehtml.sh make opening HTML also avl. on Mac
kerstin Mar 5, 2017
e016e9e
added doc for working with matplotlib
flothesof Mar 5, 2017
407cbd7
Merge pull request #345 from jeromegrosse/enhancement-aac-mp4
Mar 6, 2017
49e49ec
Added docstring
Mar 6, 2017
d5788cb
Merge pull request #458 from Gloin1313/complement#380
Mar 6, 2017
756af0f
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 6, 2017
d3ef3c2
Issue 467; fix Nameerror with copy function. Added issue to tests.…
bearney74 Mar 6, 2017
f426193
Add tests for TextClip (#469)
bearney74 Mar 6, 2017
11de2a6
Issue 285, error adding durations (int and None). (#472)
bearney74 Mar 7, 2017
b3058a6
Issue 467; fix Nameerror with copy function. Added issue to tests.…
bearney74 Mar 6, 2017
86489fb
Add tests for TextClip (#469)
bearney74 Mar 6, 2017
dfb67c3
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 9, 2017
484ea99
add mask duration (fix #354) (#355)
groundflyer Mar 10, 2017
ae93f71
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 10, 2017
cb8e3b3
add test for issue 354; duration not set (#478)
bearney74 Mar 10, 2017
f9c65f0
Issue 359, fix default opt argument to work with imageio and ImageMa…
bearney74 Mar 10, 2017
5b29868
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 10, 2017
e74b6f0
refer to MoviePy as library (was: module)
kerstin Mar 11, 2017
fa1f3a3
Merge pull request #484 from kerstin/improve_readme
kerstin Mar 11, 2017
7d1a80a
Merge pull request #463 from kerstin/improve_docs
kerstin Mar 11, 2017
c97a0b7
README spelling, punctuation
kerstin Mar 11, 2017
4faeef3
add tests for find_video_period (#486)
bearney74 Mar 13, 2017
c0602f4
Issue 470, reading past audio file EOF (#476)
bearney74 Mar 13, 2017
f221a18
fix Issue 368.. ValueError: Invalid value for quantizer: 'wu' (#460)
bearney74 Mar 13, 2017
8aa20f9
convert POpen stderr.read to communicate (#487)
bearney74 Mar 13, 2017
86c8672
resolve merge concatenate
bearney74 Mar 13, 2017
f5905f6
Merge branch 'vparitskiy-master'
bearney74 Mar 13, 2017
f2cf59c
Merge branch 'master' of github.com:Zulko/moviepy
bearney74 Mar 13, 2017
80c3f99
Fix class name in doc string
withpower Mar 13, 2017
17c0304
Update AudioFileClip.py
withpower Mar 13, 2017
caf955c
Merge pull request #488 from withpower/patch-1
bearney74 Mar 13, 2017
ba9c2d0
add matplotlib test
bearney74 Mar 13, 2017
87c07fe
add python version test
bearney74 Mar 13, 2017
7457c84
output display variable
bearney74 Mar 13, 2017
3bbb4f3
set matplotlib == 2.0.0 since 2.0.1 causes :0 error under python 3.5
bearney74 Mar 13, 2017
d7a5b82
in py 3.5 ignore matplotlib example
bearney74 Mar 13, 2017
5dc17a3
fix version
bearney74 Mar 13, 2017
d5324c2
back out duration change
bearney74 Mar 13, 2017
a7e01c3
put changes back in
bearney74 Mar 13, 2017
6d44a75
remove :0 from .travis file
bearney74 Mar 13, 2017
4a792c0
Merge pull request #490 from earney/examples
bearney74 Mar 13, 2017
03770c4
fix afterimage example
bearney74 Mar 13, 2017
e64e75b
Merge pull request #491 from earney/master
bearney74 Mar 13, 2017
0b40803
Merge pull request #275 from nad2000/master
bearney74 Mar 13, 2017
57bd77a
Allow to read resized frames
Mar 13, 2017
0422939
add a subtitle test (#495)
bearney74 Mar 14, 2017
bfb6df9
add test for file_to_subtitles function (#496)
bearney74 Mar 14, 2017
099120b
add scipy for py2.7 on travis-ci (#497)
bearney74 Mar 14, 2017
097b4a6
PEP8 fixes
Zulko Mar 15, 2017
9f1e384
Fix: Allow upscaling
Mar 15, 2017
3ff5169
Merge branch 'lowres' of github.com:gyglim/moviepy into lowres
Mar 15, 2017
28d6ebb
update readme to better document imagemagick
Mar 15, 2017
57a9003
add test for ffmpeg_parse_info (#498)
bearney74 Mar 15, 2017
2be29aa
Merge pull request #236 from achalddave/docs
bearney74 Mar 15, 2017
d633510
Merge pull request #489 from gyglim/lowres
bearney74 Mar 15, 2017
f612a45
fix for os calls through Popen that are not closed
Mar 17, 2017
3b9bf7a
Merge pull request #501 from gyglim/fix_open_pipe
bearney74 Mar 17, 2017
bcc2eb6
Add aspect_ratio @property to VideoClip
scherroman Mar 18, 2017
a2d0011
Merge pull request #503 from scherroman/aspect_ratio_property
Zulko Mar 20, 2017
7a7555a
Correcting text
gpantelis Mar 25, 2017
da7bd37
Merge pull request #510 from gpantelis/patch-1
Zulko Mar 25, 2017
024b465
Add `fps_source` parameter
tburrows13 Mar 28, 2017
61c6b5f
pass
tburrows13 Mar 28, 2017
6c2ca83
Minor Modifications to paint example (#515)
gpantelis Mar 28, 2017
e8505c3
Update test_VideoFileClip.py
Mar 28, 2017
b214bcf
#485 add comments explaining why we should use sys.sysout.flush (#514)
Mar 29, 2017
dd99abe
Update test
Mar 30, 2017
5c6737b
Added download for fps_test
Mar 30, 2017
23d33eb
Add test
Mar 30, 2017
4e55f60
Merge pull request #516 from Gloin1313/fps-option
Mar 30, 2017
c611107
packages needed for building the documentation (#483)
kerstin Mar 30, 2017
43cd9db
Audio error handling made failsafe (#377)
gyglim Apr 4, 2017
2a71175
add Dockerfile (#522)
bearney74 Apr 4, 2017
3edc5c6
Fix Issue #373 Trajectory.save_list (#394)
dermusikman Apr 4, 2017
68ee4f3
create test for Trajectory.save_list/load_list (#523)
bearney74 Apr 4, 2017
7bc468d
Increment version to 0.2.3
mbeacom Apr 5, 2017
89d18de
Update version.py
Apr 5, 2017
332ca21
Merge pull request #282 from gcandal/patch-1
Apr 5, 2017
6da89ec
Added another project using MoviePy (#509)
justswim Apr 5, 2017
f30a439
Fix #525 Resolve documentation build errors and some most
mbeacom Apr 5, 2017
5eda6c0
Merge pull request #526 from mbeacom/dev-docs
Apr 5, 2017
852bb04
Merge branch 'master' into add-matplotlib-examples
Apr 5, 2017
2648a86
Merge pull request #465 from flothesof/add-matplotlib-examples
Apr 5, 2017
0948e7a
Add int() wrapper to prevent floats
tburrows13 Apr 5, 2017
b76beb4
issue-212: add rotation info from metadata (#529)
taddyhuo Apr 6, 2017
dc74364
Removed numpy dependency
Apr 10, 2017
d51df24
Add test
Apr 11, 2017
d383873
Merge branch 'master' into scroll_fix
Apr 11, 2017
0952f10
Update download_media.py
Apr 11, 2017
7d50501
Update download_media.py
Apr 11, 2017
804e64d
Update download_media.py
bearney74 Apr 11, 2017
4c674c8
fix issue #334 (#336)
bluedazzle Apr 11, 2017
9ee3727
add test for Issue 334, PR 336 (#534)
bearney74 Apr 11, 2017
6769feb
Merge branch 'master' of https://github.com/Gloin1313/moviepy
tburrows13 Apr 11, 2017
d611d75
Update download_media.py
Apr 11, 2017
e9072a9
Update download_media.py
Apr 11, 2017
b2001d2
Merge pull request #300 from achalddave/progress_bar_write_images_seq…
Apr 11, 2017
6449a8b
Merge branch 'master' of https://github.com/Zulko/moviepy
tburrows13 Apr 11, 2017
1ba083c
Change docs
tburrows13 Apr 11, 2017
13b51e5
Fix #536 Fix youtube links
mbeacom Apr 11, 2017
987b841
add crop tests (#538)
bearney74 Apr 12, 2017
7216089
Merge pull request #537 from mbeacom/example-vid-fixes
Apr 12, 2017
e78928e
Update #530 - Split reqs and add setup.py handling
mbeacom Apr 7, 2017
0e5b06f
Update #530 Use setup.py only dep handling
mbeacom Apr 7, 2017
8b16fff
Unpin numpy dependency for py3.3
mbeacom Apr 7, 2017
edfc8bb
Update testing deps var name to align with others
mbeacom Apr 7, 2017
7a3cc62
Update test running error ref and test reqs
mbeacom Apr 12, 2017
c83bac7
create tests for blackwhite, colorx, fadein, fadeout (#539)
bearney74 Apr 12, 2017
f6ceee3
Merge pull request #531 from mbeacom/dev-reqs-setup
Apr 12, 2017
497e213
add opencv dependency since headblur effect depends on it. (#540)
bearney74 Apr 12, 2017
2243cd6
Merge pull request #535 from Gloin1313/update_docs
Apr 12, 2017
9e9a9c8
Merge branch 'master' into scroll_fix
bearney74 Apr 13, 2017
88bab48
Update version for release
mbeacom Apr 13, 2017
d41a40e
fixes #248 issue with VideoFileClip() not reading all frames (#251)
aldilaff Apr 13, 2017
a25768a
Merge pull request #528 from Gloin1313/scroll_fix
Apr 14, 2017
c7c4786
Update subtitles.py
Apr 17, 2017
906cdc4
Update VideoClip.py
Apr 17, 2017
a3efe9f
General tests cleanup
mbeacom Apr 17, 2017
b0be36b
More tests cleanup
mbeacom Apr 17, 2017
4038b8b
add path tests before importing download_media
bearney74 Apr 17, 2017
0f2b323
sys.path.append("tests") must occur before import from test_helper.
bearney74 Apr 17, 2017
50d9d51
fix import of VideoFileClip
bearney74 Apr 17, 2017
7ea41b4
fix VideoFileClip import
bearney74 Apr 17, 2017
e8bf145
Additional tests cleanup
mbeacom Apr 17, 2017
1bd8668
fix import of VideoFileClip
bearney74 Apr 17, 2017
ea89045
fix ImageSequenceClip import
bearney74 Apr 17, 2017
8f0f2b9
do not run TextClip tests if running on TRAVIS.
bearney74 Apr 17, 2017
acdf0e3
fix fx imports
bearney74 Apr 17, 2017
0f758f0
fix resize not in object x found errors.
bearney74 Apr 17, 2017
d8652bf
fix resize not found in object x errors
bearney74 Apr 17, 2017
a4fadae
fix resize and blink error.
bearney74 Apr 17, 2017
b579a06
fix blink, resize error
bearney74 Apr 17, 2017
c6e3a22
Merge pull request #548 from Gloin1313/update_docs
Apr 19, 2017
167db9f
Fix issue #464, repeated/skipped frames in ImageSequenceClip (#494)
neitzal Apr 19, 2017
ec9959a
Merge pull request #549 from mbeacom/dev-tests-cleanup
Apr 19, 2017
b67972d
add ImageSequenceClip image size exception (#550)
bearney74 Apr 19, 2017
03fdc2c
add additional ImageSequenceClip test (#551)
bearney74 Apr 20, 2017
34db3d3
Avoid mutable default arguments
quantifiedcode-bot Apr 24, 2017
7bd0678
Merge pull request #553 from mbeacom/autofix/wrapped2_to3_fix-0
Apr 25, 2017
f63a985
Fix travis build and enable pip caching (#561)
May 12, 2017
2f569d0
Fix out of bounds error
shawwn May 25, 2017
aec97bf
Fix out of range indices on last frame
shawwn May 25, 2017
99bfee2
fixed ffmpeg error reporting on Python 3 (#565)
narfdotpl May 25, 2017
1c5c633
Tiny change to error
May 29, 2017
b89966e
PEP 8 compatible
gpantelis Jun 5, 2017
6ba12d0
Merge pull request #582 from gpantelis/patch-7
Jun 6, 2017
586632b
Exceptions do not have a .message attribute.
Julian-O Jun 30, 2017
7a04047
Two small corrections to documentation.
Julian-O Jul 2, 2017
7e3a086
#600: Several YouTube examples in Gallery page won't load.
Julian-O Jul 2, 2017
2c47757
Merge pull request #605 from Julian-O/DocumentationClipInstall
Jul 8, 2017
7c61ad9
Merge pull request #606 from Julian-O/YouTubeGallery
Jul 8, 2017
d6bc0c6
Fixed Optional Progress Bar in cuts/detect_scenes (#587)
scherroman Jul 11, 2017
4d9972e
Issue #574, fix duration of masks when using concatenate(.., method="…
bearney74 Jul 14, 2017
313a557
Fixed bug in set_duration (#613)
kencochrane Jul 17, 2017
3d86a2c
Fixed typo in the slide_out transition (#612)
kencochrane Jul 17, 2017
9664b38
Add audio normalization function (#609)
dspinellis Jul 17, 2017
5a3cb6e
Use max fps for CompositeVideoClip (#610)
scherroman Jul 17, 2017
b2c5909
add tests for most fx functions (#545)
bearney74 Aug 16, 2017
02fc129
Issue629 (#630)
Julian-O Aug 16, 2017
a7f44df
sometimes tempfile.tempdir is None, so use tempfile.gettempdir() func…
bearney74 Aug 16, 2017
ea70a9e
initialize proc to None (#637)
gyglim Aug 22, 2017
d3a4091
Update README.rst
tburrows13 Aug 24, 2017
e42b3c5
Update README.rst
tburrows13 Aug 29, 2017
cd80d62
Merge pull request #570 from shawwn/fixes/indices-out-of-range
Zulko Oct 5, 2017
0b35773
fixed typo in library include
Goddard Oct 5, 2017
46aae7b
fix for issue #655
Oct 6, 2017
a9eee20
remove unnecessary check
Oct 6, 2017
01ebcc3
make python3 compatible
Oct 6, 2017
00fe917
Merge pull request #652 from Goddard/master
tburrows13 Oct 12, 2017
a744df1
Merge pull request #656 from gyglim/master
tburrows13 Oct 12, 2017
cc35d8e
Update Dockerfile to add requests module
edouard-mangel Nov 13, 2017
eacfe4a
Update Readme.rst
rlphillips Nov 21, 2017
6e731ec
Merge pull request #671 from rlphillips/master
tburrows13 Nov 28, 2017
f444f8c
Update README re imagemagick name change
tburrows13 Nov 28, 2017
4523734
fix typo
msrks Dec 20, 2017
a90d4ab
Merge pull request #687 from msrks/msrks-patch-1
tburrows13 Dec 22, 2017
6b05256
flake8 test to find syntax errors, undefined names
Feb 4, 2018
e41de74
Convert advanced_tools.py to valid Python
Feb 4, 2018
a039c03
import numpy as np for lines 151 and 178
Feb 4, 2018
3f667e1
Add gap=0 to align with lines 40, 97, and 98
Feb 5, 2018
82abf57
res —> size to align with line 62
Feb 5, 2018
7f34677
Also fix undefined names bitrate and self.(fps)
Feb 5, 2018
815296c
Merge pull request #707 from cclauss/patch-2
tburrows13 Feb 11, 2018
1de29a7
Update (#6)
tburrows13 Feb 12, 2018
006f4c8
More PEP8 compliances
tburrows13 Feb 12, 2018
996754f
Merge branch 'master' of https://github.com/tburrows13/moviepy
tburrows13 Feb 12, 2018
6583e4f
More PEP8 compliances
tburrows13 Feb 12, 2018
292ca68
Merge remote-tracking branch 'upstream/master'
tburrows13 Feb 12, 2018
501232a
PEP8
tburrows13 Feb 12, 2018
8676acc
PEP8 2
tburrows13 Feb 12, 2018
515bc8c
Merge pull request #664 from edouard-mangel/patch-1
tburrows13 Feb 12, 2018
b710a19
Merge branch 'master' into ExceptionsNoMessage
tburrows13 Feb 12, 2018
db9e5f8
More PEP8 compliance (#712)
tburrows13 Feb 12, 2018
7e96cbb
Merge branch 'master' of https://github.com/Zulko/moviepy
tburrows13 Feb 12, 2018
b0e3ed4
Merge pull request #603 from Julian-O/ExceptionsNoMessage
tburrows13 Feb 12, 2018
f7ff504
Merge branch 'master' of https://github.com/Zulko/moviepy
tburrows13 Feb 12, 2018
c26e7ac
Fix syntax error in ffmpeg_extract_subclip()
taylorjdawson Feb 12, 2018
d31cfc7
Merge branch 'master' of https://github.com/Zulko/moviepy
tburrows13 Feb 12, 2018
90c5f82
Merge pull request #710 from cclauss/patch-6
tburrows13 Feb 12, 2018
9d2c609
Fix undefined names
tburrows13 Feb 12, 2018
d6708b3
Fix bug in `credits1()`
tburrows13 Feb 12, 2018
8f3c503
PEP 8
tburrows13 Feb 12, 2018
2c5560b
PEP 8
tburrows13 Feb 12, 2018
a31be48
Added info about tag wiki
tburrows13 Feb 12, 2018
824818d
PEP 8
tburrows13 Feb 12, 2018
f92157b
Merge branch 'master' into pep8
tburrows13 Feb 12, 2018
f2b107c
Merge pull request #715 from tburrows13/pep8
tburrows13 Feb 12, 2018
913e618
Merge pull request #714 from Zulko/tburrows13-update-readme
tburrows13 Feb 12, 2018
f8241d8
Define string_types in compat.py
Feb 12, 2018
12eef3a
Use string_types in VideoClip.py
Feb 12, 2018
56f7604
Fix comments
Feb 12, 2018
62523df
Resolve undefined name execfile in Python 3
Feb 12, 2018
c023a73
Add --exit-zero to all flake8 tests
Feb 12, 2018
30e3642
Resolve undefined name unicode in Python 3
tburrows13 Feb 13, 2018
2122bc5
Resolve undefined name execfile in Python 3
tburrows13 Feb 13, 2018
dd94718
Use feature detection instead of version detection
Feb 13, 2018
9ae9de9
flake8 test to find syntax errors, undefined names in Travis
tburrows13 Feb 13, 2018
ac8d6e5
Use feature detection instead of version detection
tburrows13 Feb 13, 2018
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
61 changes: 61 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
*.py[cod]

# C extensions
*.so

# Packages
*.egg
*.egg-info
*.tar.gz
dist
build
eggs
.eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
__pycache__
.cache/

# Sublime
.sublime-project

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox
nosetests.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
.project
.pydevproject

# Temp files
*~

# Pipy codes
.pypirc

# Mac
.DS_Store

# JetBrains
.idea

# Tests
tests/media
media/

# Documentation
docs/build/
48 changes: 48 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
dist: trusty
sudo: required
language: python
cache: pip
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"

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

install:
- echo "No install action required. Implicitly performed by the testing."
- pip install flake8

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

script:
- python setup.py test --pytest-args "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

after_success:
- coveralls

matrix:
fast_finish: true
32 changes: 32 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM python:3

# Install numpy using system package manager
RUN apt-get -y update && apt-get -y install libav-tools imagemagick libopencv-dev python-opencv

# Install some special fonts we use in testing, etc..
RUN apt-get -y install fonts-liberation

RUN apt-get install -y locales && \
locale-gen C.UTF-8 && \
/usr/sbin/update-locale LANG=C.UTF-8

ENV LC_ALL C.UTF-8

# do we need all of these, maybe remove some of them?
RUN pip install imageio numpy scipy matplotlib pandas sympy nose decorator tqdm pillow pytest requests

# install scikit-image after the other deps, it doesn't cause errors this way.
RUN pip install scikit-image sklearn

ADD . /var/src/moviepy/
#RUN git clone https://github.com/Zulko/moviepy.git /var/src/moviepy
RUN cd /var/src/moviepy/ && python setup.py install

# install ffmpeg from imageio.
RUN python -c "import imageio; imageio.plugins.ffmpeg.download()"

#add soft link so that ffmpeg can executed (like usual) from command line
RUN ln -s /root/.imageio/ffmpeg/ffmpeg.linux64 /usr/bin/ffmpeg

# modify ImageMagick policy file so that Textclips work correctly.
RUN cat /etc/ImageMagick-6/policy.xml | sed 's/none/read,write/g'> /etc/ImageMagick-6/policy.xml
25 changes: 25 additions & 0 deletions LICENCE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
The MIT License (MIT)
[OSI Approved License]

The MIT License (MIT)

Copyright (c) 2015 Zulko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

4 changes: 4 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
include *.txt
recursive-include docs *
include *.rst
include ez_setup.py
182 changes: 182 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
MoviePy
=======

.. image:: https://badge.fury.io/py/moviepy.svg
:target: PyPI_
:alt: MoviePy page on the Python Package Index
.. image:: https://badges.gitter.im/movie-py/gitter.png
:target: Gitter_
:alt: Discuss MoviePy on Gitter
.. image:: https://travis-ci.org/Zulko/moviepy.svg?branch=master
:target: https://travis-ci.org/Zulko/moviepy
:alt: Build status on travis-ci

MoviePy (full documentation_) is a Python library for video editing: cutting, concatenations, title insertions, video compositing (a.k.a. non-linear editing), video processing, and creation of custom effects. See the gallery_ for some examples of use.

MoviePy can read and write all the most common audio and video formats, including GIF, and runs on Windows/Mac/Linux, with Python 2.7+ and 3. Here it is in action in an IPython notebook:

.. image:: https://github.com/raw/Zulko/moviepy/master/docs/demo_preview.jpeg
:alt: [logo]
:align: center

Example
-------

In this example we open a video file, select the subclip between t=50s and t=60s, add a title at the center of the screen, and write the result to a new file:

.. code:: python

from moviepy.editor import *

video = VideoFileClip("myHolidays.mp4").subclip(50,60)

# Make the text. Many more options are available.
txt_clip = ( TextClip("My Holidays 2013",fontsize=70,color='white')
.set_position('center')
.set_duration(10) )

result = CompositeVideoClip([video, txt_clip]) # Overlay text on video
result.write_videofile("myHolidays_edited.webm",fps=25) # Many options...


Installation
------------

MoviePy depends on the Python modules Numpy_, imageio_, Decorator_, and tqdm_, which will be automatically installed during MoviePy's installation. The software FFMPEG should be automatically downloaded/installed (by imageio) during your first use of MoviePy (installation will take a few seconds). If you want to use a specific version of FFMPEG, follow the instructions in ``config_defaults.py``. In case of trouble, provide feedback.

**Installation by hand:** download the sources, either from PyPI_ or, if you want the development version, from GitHub_, unzip everything into one folder, open a terminal and type: ::

$ (sudo) python setup.py install

**Installation with pip:** if you have ``pip`` installed, just type this in a terminal: ::

$ (sudo) pip install moviepy

If you have neither ``setuptools`` nor ``ez_setup`` installed, the command above will fail. In this case type this before installing: ::

$ (sudo) pip install ez_setup


Optional but useful dependencies
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

You can install ``moviepy`` with all dependencies via:

$ (sudo) pip install moviepy[optional]

ImageMagick_ is not strictly required, but needed if you want to incorporate texts. It can also be used as a backend for GIFs, though you can also create GIFs with MoviePy without ImageMagick.

Once you have installed ImageMagick, it will be automatically detected by MoviePy, **except on Windows!** Windows users, before installing MoviePy by hand, need to edit ``moviepy/config_defaults.py`` to provide the path to the ImageMagick binary, which is called `convert`. It should look like this ::

IMAGEMAGICK_BINARY = "C:\\Program Files\\ImageMagick_VERSION\\convert.exe"

PyGame_ is needed for video and sound previews (not relevant if you intend to work with MoviePy on a server but essential for advanced video editing by hand).

For advanced image processing, you will need one or several of the following packages:

- The Python Imaging Library (PIL) or, even better, its branch Pillow_.
- Scipy_ (for tracking, segmenting, etc.) can be used to resize video clips if PIL and OpenCV are not installed.
- `Scikit Image`_ may be needed for some advanced image manipulation.
- `OpenCV 2.4.6`_ or a more recent version (one that provides the package ``cv2``) may be needed for some advanced image manipulation.
- `Matplotlib`_

Once you have installed it, ImageMagick will be automatically detected by MoviePy, (except for windows users and Ubuntu 16.04LTS users).

For Windows users, before installing MoviePy by hand, go into the ``moviepy/config_defaults.py`` file and provide the path to the ImageMagick binary called ``magick``. It should look like this ::

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="@*" /> -->.

PyGame_ is needed for video and sound previews (useless if you intend to work with MoviePy on a server but really essential for advanced video editing *by hand*).

For instance, using the method ``clip.resize`` requires that at least one of Scipy, PIL, Pillow or OpenCV is installed.


Documentation
-------------

Running `build_docs` has additional dependencies that require installation.

$ (sudo) pip install moviepy[docs]

The documentation can be generated and viewed via:

$ python setup.py build_docs

You can pass additional arguments to the documentation build, such as clean build:

$ python setup.py build_docs -E

More information is available from the `Sphinx`_ documentation.


Running Tests
-------------

The testing suite can be executed via:

$ python setup.py test

Running the test suite in this manner will install the testing dependencies.
If you opt to run the test suite manually, you can install the dependencies via:

$ (sudo) pip install moviepy[test]


Contribute
----------

MoviePy is open-source software originally written by Zulko_ and released under the MIT licence. The project is hosted on GitHub_, where everyone is welcome to contribute, ask for help or simply give feedback.

You can also discuss the project on Reddit_ (preferred over GitHub issues for usage/examples), Gitter_ or the mailing list moviepy@librelist.com.

We have a list of tags used in our `Tag Wiki`_. The 'Pull Requests' tags are well defined, and all PRs should fall under exactly one of these. The 'Issues' tags are less precise, and may not be a complete list.


Maintainers
-----------

- Zulko_ (owner)

- `@tburrows13`_
- `@earney`_
- Kay `@kerstin`_
- `@mbeacom`_


.. MoviePy links
.. _gallery: http://zulko.github.io/moviepy/gallery.html
.. _documentation: http://zulko.github.io/moviepy/
.. _`download MoviePy`: https://github.com/Zulko/moviepy
.. _`Tag Wiki`: https://github.com/Zulko/moviepy/wiki/Tag-Wiki

.. Websites, Platforms
.. _Reddit: http://www.reddit.com/r/moviepy/
.. _PyPI: https://pypi.python.org/pypi/moviepy
.. _GitHub: https://github.com/Zulko/moviepy
.. _Gitter: https://gitter.im/movie-py/Lobby

.. Software, Tools, Libraries
.. _Pillow: http://pillow.readthedocs.org/en/latest/
.. _Scipy: http://www.scipy.org/
.. _`OpenCV 2.4.6`: http://sourceforge.net/projects/opencvlibrary/files/
.. _Pygame: http://www.pygame.org/download.shtml
.. _Numpy: http://www.scipy.org/install.html
.. _imageio: http://imageio.github.io/
.. _`Scikit Image`: http://scikit-image.org/download.html
.. _Decorator: https://pypi.python.org/pypi/decorator
.. _tqdm: https://github.com/noamraph/tqdm
.. _ffmpeg: http://www.ffmpeg.org/download.html
.. _ImageMagick: http://www.imagemagick.org/script/index.php
.. _`Matplotlib`: https://matplotlib.org/
.. _`Sphinx`: http://www.sphinx-doc.org/en/master/setuptools.html

.. People
.. _Zulko: https://github.com/Zulko
.. _`@tburrows13`: https://github.com/tburrows13
.. _`@earney`: https://github.com/earney
.. _`@kerstin`: https://github.com/kerstin
.. _`@mbeacom`: https://github.com/mbeacom
Loading