ffmpeg integration

winpython · stonebig · Aug 9, 2017 · Aug 9, 2017 · Aug 9, 2017 · 9c2ab2922b83052f4ec874d85595b4894d4d8c98
commit 9c2ab2922b83052f4ec874d85595b4894d4d8c98
diff --git a/make.py b/make.py
@@ -165,6 +165,10 @@ def get_tool_path(relpath, checkfunc):
             pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
             installed_tools += [('Pandoc', pandocver)]
 
+        ffmpegexe = get_tool_path (r'\tools\ffmpeg.exe', osp.isfile)
+        if ffmpegexe is not None:
+            ffmpegver = utils.get_ffmpeg_version(osp.dirname(ffmpegexe))
+            installed_tools += [('ffmpeg', ffmpegver)]
 
         tools = []
         for name, ver in installed_tools:
@@ -609,6 +613,14 @@ def _create_batch_scripts_initial(self):
 set JULIA_PKGDIR=%WINPYDIR%\..\settings\.julia
 :julia_bad
 
+rem ******************
+rem handle ffmpeg if included
+rem ******************
+if not exist "%WINPYDIR%\..\tools\ffmpeg.exe" goto ffmpeg_bad
+set IMAGEIO_FFMPEG_EXE=%WINPYDIR%\..\tools\ffmpeg.exe
+
+:ffmpeg_bad
+
 rem ******************
 rem WinPython.ini part (removed from nsis)
 rem ******************
@@ -683,6 +695,13 @@ def _create_batch_scripts_initial(self):
     $env:JULIA_PKGDIR = "$env:WINPYDIR\..\settings\.julia"
 }
 
+#####################
+### handle ffmpeg if included
+#####################
+if (Test-Path "$env:WINPYDIR\..\tools\ffmpeg.exe") {
+    $env:IMAGEIO_FFMPEG_EXE = "%WINPYDIR%\..\tools\ffmpeg.exe"
+}
+
 #####################
 ### WinPython.ini part (removed from nsis)
 #####################

diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '1.9.20170715'
+__version__ = '1.9.20170809'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -16,7 +16,7 @@ description=Taylor Arithmetic Computation and Algorithmic Differentiation
 [altair]
 description=High-level declarative visualization library for Python
 
-[altair-widgets]
+[altair_widgets]
 description=Altair Widgets: An interactive visualization for statistical data for Python.
 
 [amqp]
@@ -160,6 +160,9 @@ description=IPython cell magic to use .NET languages
 [colorama]
 description=Cross-platform colored terminal text
 
+[colorcet]
+description=A set of useful perceptually uniform colormaps for plotting scientific data
+
 [coloredlogs]
 description=Colored terminal output for Python's logging module
 
@@ -216,6 +219,9 @@ description=Cython implementation of Toolz: High performance functional utilitie
 [dash]
 description=A Python framework for building reactive web-apps. Developed by Plotly.
 
+[datashader]
+description=Data visualization toolchain based on aggregating into a grid
+
 [datashape]
 description=A data description language
 
@@ -446,7 +452,10 @@ description=Vestigial utilities from IPython
 description=RDBMS access via IPython
 
 [ipyvega]
-description=IPython/Jupyter notebook module for Vega, and Vega-Lite, Polestar, and Voyager
+description=IPython/Jupy
+
+[ipyvolume]
+description=3d plotting for Python in the Jupyter notebook based on IPython widgets using WebGL
 
 [ipywidgets]
 description=IPython HTML widgets for Jupyter
@@ -609,15 +618,18 @@ description=The fastest markdown parser in pure Python, inspired by marked.
 [mizani]
 description=Scales for Python
 
+[mkl-service]
+description=Python bindings to some MKL service functions 
+url=https://github.com/ContinuumIO/mkl-service
+
 [mock]
 description=Rolling backport of unittest.mock for all Pythons
 
 [monotonic]
 description=An implementation of time.monotonic() for Python 2 & < 3.3
 
-[mkl-service]
-description=Python bindings to some MKL service functions 
-url=https://github.com/ContinuumIO/mkl-service
+[moviepy]
+description=Video editing with Python
 
 [mpldatacursor]
 description=Interactive data cursors for Matplotlib
@@ -727,7 +739,7 @@ description=Data migration in Python
 [olefile]
 description=Python package to parse, read and write Microsoft OLE2 files
 
-[opencv]
+[opencv_python]
 description=Open Source Computer Vision Library
 url=http://opencv.org
 
@@ -790,6 +802,9 @@ description=Python style guide checker
 [pexpect]
 description=Pexpect allows easy control of interactive console applications.
 
+[pgmagick]
+description=Yet Another Python wrapper for GraphicsMagick
+
 [pg8000]
 description=PostgreSQL interface library
 
@@ -869,6 +884,9 @@ description=Run a subprocess in a pseudo terminal
 [pulp]
 description=PuLP is an LP modeler written in python. PuLP can generate MPS or LP files and call GLPK, COIN CLP/CBC, CPLEX, and GUROBI to solve linear problems
 
+[pweave]
+description=Scientific reports with embedded python computations with reST, LaTeX or markdown
+
 [py]
 description=library with cross-python path, ini-parsing, io, code, log facilities
 
@@ -1105,6 +1123,12 @@ description=Wavelet transforms module
 [pywin32]
 description=Python library for Windows
 
+[pywinpty]
+description=Python bindings for the winpty library
+
+[pywinusb]
+description=USB / HID windows helper library
+
 [pyyaml]
 description=YAML parser and emitter for Python
 
@@ -1191,6 +1215,9 @@ description=An Amazon S3 Transfer Manager
 [sasl]
 description=Cyrus-SASL bindings for Python
 
+[schemapi]
+description=generate Python APIs from JSONSchema specifications
+
 [scidoc]
 description=Scidoc installs scientific libraries documentation (NumPy, SciPy, ...)
 
@@ -1322,6 +1349,9 @@ description=Jupyter notebook integration with Spyder
 [spyder_reports]
 description=pyder plugin to render Markdown reports using Pweave as a backend
 
+[spyder_terminal]
+description=Spyder Plugin for displaying a virtual terminal (OS independent) inside the main Spyder window
+
 [spyder.line_profiler]
 description=a plugin to run the python line profiler from within the spyder editor
 
@@ -1438,6 +1468,9 @@ description=Ultra fast JSON encoder and decoder for Python
 [vega]
 description=An IPython/ Jupyter widget for Vega and Vega-Lite
 
+[verboselogs]
+description=Verbose logging level for Python's logging module
+
 [vispy]
 description=Interactive visualization in Python
 

diff --git a/winpython/data/tools.ini b/winpython/data/tools.ini
@@ -1,30 +1,30 @@
 [gettext]
 description=GNU gettext Win32 porting - the GNU translation tool (useful tools for pygettext, a standard library module)
-url=http://sourceforge.net/projects/gettext
+url=https://sourceforge.net/projects/gettext
 
 [julia]
 description=The Julia Langage
-url=http://julialang.org/
+url=https://julialang.org/
 
 [mingw32]
 description=C/C++ and Fortran compilers (Mingwpy static toolchain version) 
 url=https://github.com/numpy/numpy/wiki/Mingw-static-toolchain
 
 [pandoc]
 description=a universal document converter
-url=http://pandoc.org/
+url=https://pandoc.org/
 
 [r]
 description=The R Project for Statistical Computing
-url=http://www.r-project.org
+url=https://www.r-project.org
 
 [scite]
 description=SCIntilla based Text Editor - Multilanguage, powerful and light-weight text editor
 url=http://www.scintilla.org/SciTE.html
 
 [tortoisehg]
 description=Set of graphical tools and a shell extension for the Mercurial distributed revision control system
-url=http://tortoisehg.bitbucket.org
+url=https://tortoisehg.bitbucket.io/
 
 [winmerge]
 description=Open Source differencing and merging tool for Windows
@@ -33,3 +33,7 @@ url=http://winmerge.org
 [nodejs]
 description=a JavaScript runtime built on Chrome's V8 JavaScript engine
 url=https://nodejs.org
+
+[ffmpeg]
+description=a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata
+url=https://ffmpeg.org
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -230,7 +230,7 @@ def get_julia_version(path):
 
 def get_nodejs_version(path):
     """Return version of the Nodejs installed in *path*"""
-    return exec_shell_cmd('npm version', path).split(" node: '")[1].split("'")[0]
+    return exec_shell_cmd('node -v', path).splitlines()[0]
 
 def get_thg_version(path):
     """Return version of TortoiseHg installed in *path*"""
@@ -243,6 +243,10 @@ def get_pandoc_version(path):
     """Return version of the Pandoc executable in *path*"""
     return exec_shell_cmd('pandoc -v', path).splitlines()[0].split(" ")[-1]
 
+def get_ffmpeg_version(path):
+    """Return version of the Pandoc executable in *path*"""
+    return exec_shell_cmd('ffmpeg -version', path).splitlines()[0].split(" ")[2]
+
 def python_query(cmd, path):
     """Execute Python command using the Python interpreter located in *path*"""
     return exec_shell_cmd('python -c "%s"' % cmd, path).splitlines()[0]