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

Issue629 #630

Merged
34 commits merged into from
Aug 16, 2017
Merged

Issue629 #630

34 commits merged into from
Aug 16, 2017

Commits on Jun 30, 2017

  1. Configuration menu
    Copy the full SHA
    586632b View commit details
    Browse the repository at this point in the history
  2. Help tests run on Windows - don't assume temp dir or fonts.

    * Python already has a feature for finding the temp dir. Changed
    test helper to take advantage of it.
    
    * Still outstanding: Several hard-coded references to /tmp appear in
    the tests.
    
    * Liberation-Mono is not commonly installed on Windows, and even when
    it is, the font has a different name. Provide a fall-back for Windows
    fonts. (Considered the use of a 3rd party tool to help select, but
    seemed overkill.)
    Julian-O committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    c79d202 View commit details
    Browse the repository at this point in the history
  3. Help tests run on Windows - allow some flexibility in versions.

    Building/finding binaries on Windows is non-trivial. Aallow some
    flexibility in the path levels. (I don't want to force existing users
    to upgrade, but new users should be allowed the later patches.)
    Julian-O committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    328de3d View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2017

  1. Issue 596: Add initial support for closing clips.

    Doesn't do anything yet. The work is done in the subclasses that need
    it.
    
    Also supports context manager, to allow close to be implicitly performed
    without being forgotten even if an exception occurs during processes.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    9939f52 View commit details
    Browse the repository at this point in the history
  2. Issue 596: Update doctest examples to call close.

    Demonstrate good practice in the examples.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    e50aef7 View commit details
    Browse the repository at this point in the history
  3. More exception details for easier debugging of ImageMagick issues.

    Especially for Windows.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    dc4a16a View commit details
    Browse the repository at this point in the history
  4. Issue Zulko#596: Move away from expecting/requiring __del__ to be cal…

    …led.
    
    The work should be done in close(). Deleting can be left for the garbage
    collector.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    bf9c3ad View commit details
    Browse the repository at this point in the history
  5. Issue Zulko#596: Move ffmpeg_writer to using close.

    Again, avoid depending on __del__. Add a context manager interface.
    Use it lower down.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    de5cb86 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    505939f View commit details
    Browse the repository at this point in the history
  7. Issue Zulko#596: Move AudioFileClip to use close(), away from __del__.

    Was concerned that lambda might include a reference to reader that
    wasn't cleaned up by close, so changed it over to an equivalent
    self.reader. Probably has no effect, but feels safer.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    09bc06a View commit details
    Browse the repository at this point in the history
  8. Issue Zulko#596: Support close() on CompositeVideoClip.

    Note: It does NOT close all the subclips, because they may be used
    again (by the caller). It is the caller's job to clean them up.
    
    But clips created by this instance are closed by this instance.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    495cd3e View commit details
    Browse the repository at this point in the history
  9. Issue Zulko#596: Add tests to see if this issue has been repaired.

    test_resourcereleasedemo exercises the path where close is not called
    and demonstrates that there is a consistent problem on Windows. Even
    after this fix, it remains a problem that if you don't call close,
    moviepg will leak locked files and subprocesses. [Because the problem
    remains until the process ends, this is included in
    a separate test file.]
    
    test_resourcerelease demonstrates that when close() is called, the
    problem goes away.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    2c5307b View commit details
    Browse the repository at this point in the history
  10. Issue Zulko#596: Update tests to use close().

    * Without tests changes, many of these existing tests do not pass on
    Windows.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    c1a1563 View commit details
    Browse the repository at this point in the history
  11. Further to PR Zulko#597: Change to Arial

    Helvetica wasn't recognised by ImageMagick. Changing to another
    arbitrary font that should be available on all Windows machines.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    ff38df9 View commit details
    Browse the repository at this point in the history
  12. Issue Zulko#596 and Zulko#598: Updated test to support close().

    Also changed test to meet Issue Zulko#598, but that is also being done in
    PR#585, so will require a merge.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    c4d8e40 View commit details
    Browse the repository at this point in the history
  13. Revert "More exception details for easier debugging of ImageMagick is…

    …sues."
    
    This reverts commit dc4a16a.
    
    I bundled too much into one commit. Reverting and reapplying as two separate commits for better history.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    e72cc02 View commit details
    Browse the repository at this point in the history
  14. Issue Zulko#599: test_6 doesn't test anything.

    Removed as it was crashing on Windows, achieving nothing on Linux.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    ff6688c View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    f4dcd47 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    65971a0 View commit details
    Browse the repository at this point in the history
  17. Clip class missing from reference documents.

    Due to failing import.
    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    e21be36 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    9383de5 View commit details
    Browse the repository at this point in the history
  19. Fix failing doctest.

    Julian-O committed Jul 1, 2017
    Configuration menu
    Copy the full SHA
    7f930e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2017

  1. Issue 596: Add initial support for closing clips.

    * Add key support for close()
    
       * FFMPEG_VideoWriter and FFMPEG_AudioWriter: Support close() and context managers.
       * Clip: support close() and context manager. Doesn't do anything itself. The work is done in the subclasses that need it.
       * Clip subclasses: Overrride close.
           * Move away from depending on clients calling__del__(). Deleting can be left to Garbage Collector.
       * CompositeVideoClip: Note: Don't close anything that wasn't constructed here. The client needs to be able to control the component clips.
       * AudioFileClip:  Was concerned that lambda might include a reference to reader that wasn't cleaned up by close, so changed it over to an equivalent self.reader. Probably has no effect, but feels safer.
    
    * Update tests to use close().
    
       * Note: While many tests pass on Linux either way, a large proportion of the existing unit tests fail on Windows without these changes.
       * Include changes to many doctest examples - Demonstrate good practice in the examples.
       * Also, migrate tests to use TEMPDIR where they were not using it.
       * test_duration(): also corrected a bug in the test (described in Zulko#598). This bug is also been addressed in Zulko#585, so a merge will be required.
    
    * Add two new test files:
    
       *  test_resourcereleasedemo exercises the path where close is not called and demonstrates that there is a consistent problem on Windows. Even after this fix, it remains a problem that if you don't call close, moviepg will leak locked files and subprocesses. Because the problem remains until the process ends, this is included in a separate test file.]
       * test_resourcerelease demonstrates that when close() is called, the problem goes away.
    
    * Update documentation to include usage tips for close()
    
    Not included:
    
        *  Example code has not been updated to use close().
    Julian-O committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    53c60b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Merge branch 'WindowsSupport' of C:\Users\xboxl\OneDrive\Documents\My…

    …Apps\moviepy with conflicts.
    Julian-O committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    2221c5e View commit details
    Browse the repository at this point in the history
  2. Merge

    Julian-O committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    7c3f525 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. Neaten up output and PEP8 compliance.

    Also, make runnable directly (to help debugging)
    Julian-O committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    0c3b1be View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce44cd7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0415123 View commit details
    Browse the repository at this point in the history
  4. Migrate to use requests to avoid certificate problems.

    Old versions of urlretrieve have old certificates which means one of the
    video downloads was failing.
    
    Also requires changes to setup.py, to come.
    Julian-O committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    2fc414f View commit details
    Browse the repository at this point in the history
  5. Clean up of dependencies.

    Including adding ranges, removing unnecessary entries, adding missing
    entries, adding environment markers, changing versions, and updating
    pytest parameter handling.
    Julian-O committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    ec2d5ba View commit details
    Browse the repository at this point in the history
  6. Simplification of Travis file - letting te setup.py do the heavy lifting

    Remove conditional installations repeating the rules in setup.py
    Remove some installation of test needs repeating the rules in setup.py
    Add testing of installation options.
    Julian-O committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    fc2b64e View commit details
    Browse the repository at this point in the history
  7. Add Appveyor support.

    Julian-O committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    abcf4cc View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. Solve Issue 629.

    Julian-O committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    ab19580 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    98a4f14 View commit details
    Browse the repository at this point in the history