forked from Zulko/moviepy
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fixed copy-paste typo Changed documentation for the color parameter to distinguish from bg_color * Fixed missing list (using python 3) * fixed module hierarchy for Trajectory * fixed addy * small recipe * on_color function docstring has wrong parameter The docstring for the on_color method has a parameter of bg_color but the function uses color as the parameter. * Update README.rst Changed Code Block to use Python Syntax Highlighting * fix deprecation message currently, the docstring is nonsense. ``` The function ``concatenate_videoclips`` is deprecated and is kept temporarily for backwards compatibility. Please use the new name, ``concatenate_videoclips``, instead. ``` * ImageSequenceClip: Check for fps and durations rather than fps and duration * Add a test case. * Add another test * ensures int arguments to np.reshape; closes Zulko#383 * fix issue Zulko#401 * fix issue Zulko#335 * Update maintainer section in README * make concatenate_videoclips Python 3 compatible.. fix issue Zulko#313 * Increment release version * CompositeVideoClip doesn't accept an argument of transparent * move PY3 variable to compat.py * fix movie => moviepy typo * fix issue Zulko#341 * Fixed typo Zulko#375 Zulko#375 fixed * fix issue Zulko#357, which makes real problem more obvious (media file does not exist * Revert "small recipe (mirroring a video)" * Fixed indentation * .gitignore ignore Mac-specific files, Jetbrains settings dir * README.rst make mention of Gitter, add PyPI and Gitter badge * README.rst wording, formatting * README.rst structure link targets, add co-maintainers (with @username) * README.rst move maintainers, contributing sections; change docs x-reference name * README.rst fix grammar * fix issue 145. raise Exception when concatenate method != chain or compose * make PEP8 compatible * fix PR Zulko#413 . (issue Zulko#357) * create test for issue Zulko#145 * add tests/media to .gitignore * fix Issue Zulko#385 , no DirectoryClip class (Zulko#434) * fix issue Zulko#385 , no DirectoryClip class * replace DirectoryClip with ImageSequenceClip * fix issue 417, unicode has no attribute 'shape' error. * add test for issue 417 * add test for issue 417 * Fixed resize documentation issue Zulko#319 (Zulko#346) * Handle bytes when listing fonts in VideoClip.py (Zulko#306) Handle bytes when listing fonts in VideoClip.py * add test for PR306 * add test for PR306 (Zulko#440) * create test file for pull requests (Zulko#433) * Test issue 407 (video has a valid fps after concatenate function) (Zulko#443) * Move PR test to test_PR.py file (Zulko#444) * move PR test from test_issues.py to test_PR.py * add code to download python_logo.png * remove duplicate test_issue_417 function * add testing with travis-ci (Zulko#447) added testing via travis-ci * put DEVNULL into compat.py (Zulko#432) * add travis-ci badge to readme file * pick highest fps when concatenating (Zulko#416) * readers.py cast chunksize from float to int * choose highest fps of clips when concatenating * pick highest fps when concatenating * pick highest fps when concatenating * fps either max or none * remove resolve markers removed resolve markers such as HEAD, etc so that the file will compile correctly. Remove some double blank lines, etc * update concatenate.py; add c.fps is not None * add test for issue 416 * fix test_issue_416
- Loading branch information
Gloin1313
authored
Feb 27, 2017
1 parent
acfe6dc
commit 25ed5a4
Showing
25 changed files
with
298 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,9 +40,15 @@ nosetests.xml | |
.pydevproject | ||
|
||
# Temp files | ||
|
||
*~ | ||
|
||
# Pipy codes | ||
|
||
.pypirc | ||
|
||
# Mac | ||
.DS_Store | ||
|
||
# JetBrains | ||
.idea | ||
|
||
tests/media |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
language: python | ||
python: | ||
- "2.7" | ||
- "3.3" | ||
- "3.4" | ||
- "3.5" | ||
- "3.6" | ||
# command to install dependencies | ||
before_install: | ||
- sudo apt-get -qq update | ||
- sudo apt-get install -y ffmpeg | ||
- mkdir media | ||
install: | ||
- python setup.py install | ||
# command to run tests | ||
script: py.test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import os | ||
import sys | ||
PY3=sys.version_info.major >= 3 | ||
|
||
if PY3: | ||
from subprocess import DEVNULL # py3k | ||
else: | ||
DEVNULL = open(os.devnull, 'wb') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
__version__ = "0.2.2.12" | ||
__version__ = "0.2.2.13" |
Oops, something went wrong.