Hello community,
here is the log from the commit of package python-moviepy for openSUSE:Factory
checked in at 2018-06-08 23:14:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-moviepy (Old)
and /work/SRC/openSUSE:Factory/.python-moviepy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-moviepy"
Fri Jun 8 23:14:27 2018 rev:3 rq:614244 version:0.2.3.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-moviepy/python-moviepy.changes
2018-06-05 12:53:34.876166280 +0200
+++ /work/SRC/openSUSE:Factory/.python-moviepy.new/python-moviepy.changes
2018-06-08 23:14:30.366142984 +0200
@@ -1,0 +2,7 @@
+Mon Jun 4 21:01:01 UTC 2018 - mc...@suse.com
+
+- I don't think we need to protect the test files, especially given the
+ testsuite can hardly be run on plain openSUSE withtout packages from
+ additional non-standard repositories.
+
+-------------------------------------------------------------------
Old:
----
moviepy-0.2.3.4.tar.gz
New:
----
moviepy-0.2.3.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-moviepy.spec ++++++
--- /var/tmp/diff_new_pack.nfuL0d/_old 2018-06-08 23:14:31.014119583 +0200
+++ /var/tmp/diff_new_pack.nfuL0d/_new 2018-06-08 23:14:31.018119439 +0200
@@ -16,15 +16,17 @@
#
+%define modname moviepy
+
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-moviepy
-Version: 0.2.3.4
+Name: python-%{modname}
+Version: 0.2.3.5
Release: 0
Summary: Video editing with Python
License: MIT
Group: Development/Languages/Python
-Url: https://github.com/Zulko/moviepy
-Source:
https://files.pythonhosted.org/packages/source/m/moviepy/moviepy-%{version}.tar.gz
+Url: https://github.com/Zulko/%{modname}
+Source:
https://files.pythonhosted.org/packages/source/m/%{modname}/%{modname}-%{version}.tar.gz
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -72,30 +74,30 @@
effects. See the gallery_ for some examples of use.
%prep
-%setup -q -n moviepy-%{version}
+%setup -q -n %{modname}-%{version}
%build
%python_build
%install
%python_install
-
-%{python_expand mv %{buildroot}%{$python_sitelib}/tests
%{buildroot}%{$python_sitelib}/moviepy/
-%fdupes %{buildroot}%{$python_sitelib}
-$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/audio/
-$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/audio/
-$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/tests/
-$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/tests/
-$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/video/
-$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/video/
-$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/video/compositing/
-$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/moviepy/video/compositing/
+%python_expand rm -rf %{buildroot}%{$python_sitelib}/tests
+%{python_expand %fdupes %{buildroot}%{$python_sitelib}
+$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/%{modname}/audio/
+$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/%{modname}/audio/
+$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/%{modname}/video/
+$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/%{modname}/video/
+$python -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/%{modname}/video/compositing/
+$python -O -m compileall -d %{$python_sitelib}
%{buildroot}%{$python_sitelib}/%{modname}/video/compositing/
%fdupes %{buildroot}%{$python_sitelib}
}
+# We don’t run test suite, because it depends on ffmpeg and various
+# documents downloaded from the Internet.
+
%files %{python_files}
%doc README.rst
%license LICENCE.txt
-%{python_sitelib}/*
+%{python_sitelib}/%{modname}*
%changelog
++++++ moviepy-0.2.3.4.tar.gz -> moviepy-0.2.3.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/PKG-INFO new/moviepy-0.2.3.5/PKG-INFO
--- old/moviepy-0.2.3.4/PKG-INFO 2018-04-22 20:11:21.000000000 +0200
+++ new/moviepy-0.2.3.5/PKG-INFO 2018-05-31 22:43:47.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: moviepy
-Version: 0.2.3.4
+Version: 0.2.3.5
Summary: Video editing with Python
Home-page: https://zulko.github.io/moviepy/
Author: Zulko 2017
@@ -163,11 +163,11 @@
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.
+ 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. Please
read our `Contributing Guidelines`_ for more information about how to
contribute!
- You can also discuss the project on Reddit_ (preferred over GitHub
issues for usage/examples), Gitter_ or the mailing list movi...@librelist.com.
+ You can also discuss the project on Reddit_ or Gitter_. These are
preferred over GitHub issues for usage questions and examples.
- 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.
+ We have a list of labels used in our `Label Wiki`_. The 'Pull
Requests' labels are well defined, and all PRs should fall under exactly one of
these. The 'Issues' labels are less precise, and may not be a complete list.
Maintainers
@@ -185,7 +185,8 @@
.. _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
+ .. _`Label Wiki`: https://github.com/Zulko/moviepy/wiki/Label-Wiki
+ .. _Contributing Guidelines:
https://github.com/Zulko/moviepy/blob/master/CONTRIBUTING.md
.. Websites, Platforms
.. _Reddit: http://www.reddit.com/r/moviepy/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/README.rst
new/moviepy-0.2.3.5/README.rst
--- old/moviepy-0.2.3.4/README.rst 2018-04-09 18:09:57.000000000 +0200
+++ new/moviepy-0.2.3.5/README.rst 2018-05-29 23:29:03.000000000 +0200
@@ -154,11 +154,11 @@
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.
+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. Please read our
`Contributing Guidelines`_ for more information about how to contribute!
-You can also discuss the project on Reddit_ (preferred over GitHub issues for
usage/examples), Gitter_ or the mailing list movi...@librelist.com.
+You can also discuss the project on Reddit_ or Gitter_. These are preferred
over GitHub issues for usage questions and examples.
-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.
+We have a list of labels used in our `Label Wiki`_. The 'Pull Requests' labels
are well defined, and all PRs should fall under exactly one of these. The
'Issues' labels are less precise, and may not be a complete list.
Maintainers
@@ -176,7 +176,8 @@
.. _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
+.. _`Label Wiki`: https://github.com/Zulko/moviepy/wiki/Label-Wiki
+.. _Contributing Guidelines:
https://github.com/Zulko/moviepy/blob/master/CONTRIBUTING.md
.. Websites, Platforms
.. _Reddit: http://www.reddit.com/r/moviepy/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/moviepy/version.py
new/moviepy-0.2.3.5/moviepy/version.py
--- old/moviepy-0.2.3.4/moviepy/version.py 2018-04-22 20:08:49.000000000
+0200
+++ new/moviepy-0.2.3.5/moviepy/version.py 2018-05-31 22:34:27.000000000
+0200
@@ -1 +1 @@
-__version__ = "0.2.3.4"
+__version__ = "0.2.3.5"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/moviepy/video/VideoClip.py
new/moviepy-0.2.3.5/moviepy/video/VideoClip.py
--- old/moviepy-0.2.3.4/moviepy/video/VideoClip.py 2018-02-28
22:18:27.000000000 +0100
+++ new/moviepy-0.2.3.5/moviepy/video/VideoClip.py 2018-05-29
23:30:45.000000000 +0200
@@ -314,7 +314,8 @@
audio_nbytes, audio_bufsize,
audio_codec, bitrate=audio_bitrate,
write_logfile=write_logfile,
- verbose=verbose,
progress_bar=progress_bar)
+ verbose=verbose,
+ progress_bar=progress_bar)
ffmpeg_write_video(self, filename, fps, codec,
bitrate=bitrate,
@@ -394,7 +395,8 @@
@convert_masks_to_RGB
def write_gif(self, filename, fps=None, program='imageio',
opt='nq', fuzz=1, verbose=True,
- loop=0, dispose=False, colors=None, tempfiles=False):
+ loop=0, dispose=False, colors=None, tempfiles=False,
+ progress_bar=True):
""" Write the VideoClip to a GIF file.
Converts a VideoClip into an animated GIF using ImageMagick
@@ -430,6 +432,9 @@
Useful on computers with little RAM. Can only be used with
ImageMagick' or 'ffmpeg'.
+ progress_bar
+ If True, displays a progress bar
+
Notes
-----
@@ -447,7 +452,8 @@
if program == 'imageio':
write_gif_with_image_io(self, filename, fps=fps, opt=opt,
loop=loop,
- verbose=verbose, colors=colors)
+ verbose=verbose, colors=colors,
+ progress_bar=progress_bar)
elif tempfiles:
# convert imageio opt variable to something that can be used with
# ImageMagick
@@ -459,11 +465,13 @@
write_gif_with_tempfiles(self, filename, fps=fps,
program=program, opt=opt1, fuzz=fuzz,
verbose=verbose, loop=loop,
- dispose=dispose, colors=colors)
+ dispose=dispose, colors=colors,
+ progress_bar=progress_bar)
else:
write_gif(self, filename, fps=fps, program=program,
opt=opt, fuzz=fuzz, verbose=verbose, loop=loop,
- dispose=dispose, colors=colors)
+ dispose=dispose, colors=colors,
+ progress_bar=progress_bar)
# -----------------------------------------------------------------
# F I L T E R I N G
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/moviepy/video/io/ffmpeg_reader.py
new/moviepy-0.2.3.5/moviepy/video/io/ffmpeg_reader.py
--- old/moviepy-0.2.3.4/moviepy/video/io/ffmpeg_reader.py 2018-02-12
12:42:34.000000000 +0100
+++ new/moviepy-0.2.3.5/moviepy/video/io/ffmpeg_reader.py 2018-05-01
19:30:16.000000000 +0200
@@ -385,7 +385,8 @@
line = lines_audio[0]
try:
match = re.search(" [0-9]* Hz", line)
- result['audio_fps'] = int(line[match.start()+1:match.end()])
+ hz_string = line[match.start()+1:match.end()-3] # Removes the
'hz' from the end
+ result['audio_fps'] = int(hz_string)
except:
result['audio_fps'] = 'unknown'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/moviepy/video/io/gif_writers.py
new/moviepy-0.2.3.5/moviepy/video/io/gif_writers.py
--- old/moviepy-0.2.3.4/moviepy/video/io/gif_writers.py 2018-02-28
22:18:27.000000000 +0100
+++ new/moviepy-0.2.3.5/moviepy/video/io/gif_writers.py 2018-05-29
23:30:45.000000000 +0200
@@ -19,7 +19,7 @@
@use_clip_fps_by_default
def write_gif_with_tempfiles(clip, filename, fps=None, program= 'ImageMagick',
opt="OptimizeTransparency", fuzz=1, verbose=True,
- loop=0, dispose=True, colors=None):
+ loop=0, dispose=True, colors=None, progress_bar=True):
""" Write the VideoClip to a GIF file.
@@ -40,8 +40,13 @@
verbose_print(verbose, "[MoviePy] Generating GIF frames...\n")
- total = int(clip.duration*fps)+1
- for i, t in tqdm(enumerate(tt), total=total):
+ if progress_bar:
+ total = int(clip.duration*fps)+1
+ iterator = tqdm(enumerate(tt), total=total)
+ else:
+ iterator = enumerate(tt)
+
+ for i, t in iterator:
name = "%s_GIFTEMP%04d.png"%(fileName, i+1)
tempfiles.append(name)
@@ -96,7 +101,7 @@
@use_clip_fps_by_default
def write_gif(clip, filename, fps=None, program= 'ImageMagick',
opt="OptimizeTransparency", fuzz=1, verbose=True, withmask=True,
- loop=0, dispose=True, colors=None):
+ loop=0, dispose=True, colors=None, progress_bar=True):
""" Write the VideoClip to a GIF file, without temporary files.
Converts a VideoClip into an animated GIF using ImageMagick
@@ -220,7 +225,7 @@
try:
- for t,frame in clip.iter_frames(fps=fps, progress_bar=True,
+ for t,frame in clip.iter_frames(fps=fps, progress_bar=progress_bar,
with_times=True, dtype="uint8"):
if withmask:
mask = 255 * clip.mask.get_frame(t)
@@ -251,7 +256,7 @@
def write_gif_with_image_io(clip, filename, fps=None, opt=0, loop=0,
- colors=None, verbose=True):
+ colors=None, verbose=True, progress_bar=True):
"""
Writes the gif with the Python library ImageIO (calls FreeImage).
@@ -282,7 +287,7 @@
)
verbose_print(verbose, "\n[MoviePy] Building file %s with imageio\n" %
filename)
-
- for frame in clip.iter_frames(fps=fps, progress_bar=True, dtype='uint8'):
+
+ for frame in clip.iter_frames(fps=fps, progress_bar=progress_bar,
dtype='uint8'):
writer.append_data(frame)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/moviepy.egg-info/PKG-INFO
new/moviepy-0.2.3.5/moviepy.egg-info/PKG-INFO
--- old/moviepy-0.2.3.4/moviepy.egg-info/PKG-INFO 2018-04-22
20:11:20.000000000 +0200
+++ new/moviepy-0.2.3.5/moviepy.egg-info/PKG-INFO 2018-05-31
22:43:46.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: moviepy
-Version: 0.2.3.4
+Version: 0.2.3.5
Summary: Video editing with Python
Home-page: https://zulko.github.io/moviepy/
Author: Zulko 2017
@@ -163,11 +163,11 @@
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.
+ 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. Please
read our `Contributing Guidelines`_ for more information about how to
contribute!
- You can also discuss the project on Reddit_ (preferred over GitHub
issues for usage/examples), Gitter_ or the mailing list movi...@librelist.com.
+ You can also discuss the project on Reddit_ or Gitter_. These are
preferred over GitHub issues for usage questions and examples.
- 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.
+ We have a list of labels used in our `Label Wiki`_. The 'Pull
Requests' labels are well defined, and all PRs should fall under exactly one of
these. The 'Issues' labels are less precise, and may not be a complete list.
Maintainers
@@ -185,7 +185,8 @@
.. _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
+ .. _`Label Wiki`: https://github.com/Zulko/moviepy/wiki/Label-Wiki
+ .. _Contributing Guidelines:
https://github.com/Zulko/moviepy/blob/master/CONTRIBUTING.md
.. Websites, Platforms
.. _Reddit: http://www.reddit.com/r/moviepy/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/moviepy-0.2.3.4/tests/test_ffmpeg_reader.py
new/moviepy-0.2.3.5/tests/test_ffmpeg_reader.py
--- old/moviepy-0.2.3.4/tests/test_ffmpeg_reader.py 2018-02-12
12:42:34.000000000 +0100
+++ new/moviepy-0.2.3.5/tests/test_ffmpeg_reader.py 2018-05-01
19:30:16.000000000 +0200
@@ -21,6 +21,15 @@
d=ffmpeg_parse_infos("media/pigs_in_a_polka.gif")
assert d['video_size'] == [314, 273]
assert d['duration'] == 3.0
+ assert not d['audio_found']
+
+ d=ffmpeg_parse_infos("media/video_with_failing_audio.mp4")
+ assert d['audio_found']
+ assert d['audio_fps'] == 44100
+
+ d=ffmpeg_parse_infos("media/crunching.mp3")
+ assert d['audio_found']
+ assert d['audio_fps'] == 48000
if __name__ == '__main__':
