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

Colorclip changed col>color #424

Merged
merged 14 commits into from
Mar 2, 2017
Merged

Commits on Feb 18, 2017

  1. Changed the col paramater of ColorClip to color and added a Dep…

    …recationWarning if the users tries to use `col`
    tburrows13 committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    87699df View commit details
    Browse the repository at this point in the history
  2. Update VideoFileClip.py

    Gloin1313 committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    85d1cc6 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. Added warnings

    tburrows13 committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    e9d1b00 View commit details
    Browse the repository at this point in the history
  2. Update (#3)

    * 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
    Gloin1313 committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    25ed5a4 View commit details
    Browse the repository at this point in the history
  3. Update Gloin (#4)

    * 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
    Gloin1313 committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    c7e1848 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #5 from Zulko/master

    Update
    Gloin1313 committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    cd06bc1 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2017

  1. Merge branch 'master' into colorclip-update

    Gloin1313 committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    0dd5623 View commit details
    Browse the repository at this point in the history
  2. Update VideoFileClip.py

    Gloin1313 committed Feb 28, 2017
    Configuration menu
    Copy the full SHA
    41691e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Configuration menu
    Copy the full SHA
    587c6a0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    22646a3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b62b117 View commit details
    Browse the repository at this point in the history
  4. Added test

    tburrows13 committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    f50af0a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    17b0441 View commit details
    Browse the repository at this point in the history
  6. Change

    tburrows13 committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    0395b93 View commit details
    Browse the repository at this point in the history