8000 Merge pull request #555 from stonebig/master · craisi/winpython@309e49b · GitHub
[go: up one dir, main page]
Skip to content

Commit 309e49b

Browse files
stonebigstonebig
authored
Merge pull request winpython#555 from stonebig/master
ffmpeg integration
2 parents 632fe9a + 9c2ab29 commit 309e49b

File tree

5 files changed

+73
-13
lines changed

5 files changed

+73
-13
lines changed

‎make.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ def get_tool_path(relpath, checkfunc):
165165
pandocver = utils.get_pandoc_version(osp.dirname(pandocexe))
166166
installed_tools += [('Pandoc', pandocver)]
167167

168+
ffmpegexe = get_tool_path (r'\tools\ffmpeg.exe', osp.isfile)
169+
if ffmpegexe is not None:
170+
ffmpegver = utils.get_ffmpeg_version(osp.dirname(ffmpegexe))
171+
installed_tools += [('ffmpeg', ffmpegver)]
168172

169173
tools = []
170174
for name, ver in installed_tools:
@@ -609,6 +613,14 @@ def _create_batch_scripts_initial(self):
609613
set JULIA_PKGDIR=%WINPYDIR%\..\settings\.julia
610614
:julia_bad
611615
616+
rem ******************
617+
rem handle ffmpeg if included
618+
rem ******************
619+
if not exist "%WINPYDIR%\..\tools\ 10000 ffmpeg.exe" goto ffmpeg_bad
620+
set IMAGEIO_FFMPEG_EXE=%WINPYDIR%\..\tools\ffmpeg.exe
621+
622+
:ffmpeg_bad
623+
612624
rem ******************
613625
rem WinPython.ini part (removed from nsis)
614626
rem ******************
@@ -683,6 +695,13 @@ def _create_batch_scripts_initial(self):
683695
$env:JULIA_PKGDIR = "$env:WINPYDIR\..\settings\.julia"
684696
}
685697
698+
#####################
699+
### handle ffmpeg if included
700+
#####################
701+
if (Test-Path "$env:WINPYDIR\..\tools\ffmpeg.exe") {
702+
$env:IMAGEIO_FFMPEG_EXE = "%WINPYDIR%\..\tools\ffmpeg.exe"
703+
}
704+
686705
#####################
687706
### WinPython.ini part (removed from nsis)
688707
#####################

‎winpython/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '1.9.20170715'
31+
__version__ = '1.9.20170809'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

‎winpython/data/packages.ini

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ description=Taylor Arithmetic Computation and Algorithmic Differentiation
1616
[altair]
1717
description=High-level declarative visualization library for Python
1818

19-
[altair-widgets]
19+
[altair_widgets]
2020
description=Altair Widgets: An interactive visualization for statistical data for Python.
2121

2222
[amqp]
@@ -160,6 +160,9 @@ description=IPython cell magic to use .NET languages
160160
[colorama]
161161
description=Cross-platform colored terminal text
162162

163+
[colorcet]
164+
description=A set of useful perceptually uniform colormaps for plotting scientific data
165+
163166
[coloredlogs]
164167
description=Colored terminal output for Python's logging module
165168
@@ -216,6 +219,9 @@ description=Cython implementation of Toolz: High performance functional utilitie
216219
[dash]
217220
description=A Python framework for building reactive web-apps. Developed by Plotly.
218221

222+
[datashader]
223+
description=Data visualization toolchain based on aggregating into a grid
224+
219225
[datashape]
220226
description=A data description language
221227

@@ -446,7 +452,10 @@ description=Vestigial utilities from IPython
446452
description=RDBMS access via IPython
447453

448454
[ipyvega]
449-
description=IPython/Jupyter notebook module for Vega, and Vega-Lite, Polestar, and Voyager
455+
description=IPython/Jupy
456+
457+
[ipyvolume]
458+
description=3d plotting for Python in the Jupyter notebook based on IPython widgets using WebGL
450459

451460
[ipywidgets]
452461
description=IPython HTML widgets for Jupyter
@@ -609,15 +618,18 @@ description=The fastest markdown parser in pure Python, inspired by marked.
609618
[mizani]
610619
description=Scales for Python
611620
621+
[mkl-service]
622+
description=Python bindings to some MKL service functions
623+
url=https://github.com/ContinuumIO/mkl-service
624+
612625
[mock]
613626
description=Rolling backport of unittest.mock for all Pythons
614627
615628
[monotonic]
616629
description=An implementation of time.monotonic() for Python 2 & < 3.3
617630
618-
[mkl-service]
619-
description=Python bindings to some MKL service functions
620-
url=https://github.com/ContinuumIO/mkl-service
631+
[moviepy]
632+
description=Video editing with Python
621633
622634
[mpldatacursor]
623635
description=Interactive data cursors for Matplotlib
@@ -727,7 +739,7 @@ description=Data migration in Python
727739
[olefile]
728740
description=Python package to parse, read and write Microsoft OLE2 files
729741
730-
[opencv]
742+
[opencv_python]
731743
description=Open Source Computer Vision Library
732744
url=http://opencv.org
733745
@@ -790,6 +802,9 @@ description=Python style guide checker
790802
[pexpect]
791803
description=Pexpect allows easy control of interactive console applications.
792804
805+
[pgmagick]
806+
description=Yet Another Python wrapper for GraphicsMagick
807+
793808
[pg8000]
794809
description=PostgreSQL interface library
795810
@@ -869,6 +884,9 @@ description=Run a subprocess in a pseudo terminal
869884
[pulp]
870885
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
871886

887+
[pweave]
888+
description=Scientific reports with embedded python computations with reST, LaTeX or markdown
889+
872890
[py]
873891
description=library with cross-python path, ini-parsing, io, code, log facilities
874892

@@ -1105,6 +1123,12 @@ description=Wavelet transforms module
11051123
[pywin32]
11061124
description=Python library for Windows
11071125
1126+
[pywinpty]
1127+
description=Python bindings for the winpty library
1128+
1129+
[pywinusb]
1130+
description=USB / HID windows helper library
1131+
11081132
[pyyaml]
11091133
description=YAML parser and emitter for Python
11101134
@@ -1191,6 +1215,9 @@ description=An Amazon S3 Transfer Manager
11911215
[sasl]
11921216
description=Cyrus-SASL bindings for Python
11931217
1218+
[schemapi]
1219+
description=generate Python APIs from JSONSchema specifications
1220+
11941221
[scidoc]
11951222
description=Scidoc installs scientific libraries documentation (NumPy, SciPy, ...)
11961223
@@ -1322,6 +1349,9 @@ description=Jupyter notebook integration with Spyder
13221349
[spyder_reports]
13231350
description=pyder plugin to render Markdown reports using Pweave as a backend
13241351

1352+
[spyder_terminal]
1353+
description=Spyder Plugin for displaying a virtual terminal (OS independent) inside the main Spyder window
1354+
13251355
[spyder.line_profiler]
13261356
description=a plugin to run the python line profiler from within the spyder editor
13271357

@@ -1438,6 +1468,9 @@ description=Ultra fast JSON encoder and decoder for Python
14381468
[vega]
14391469
description=An IPython/ Jupyter widget for Vega and Vega-Lite
14401470
1471+
[verboselogs]
1472+
description=Verbose logging level for Python's logging module
1473+
14411474
[vispy]
14421475
description=Interactive visualization in Python
14431476

‎winpython/data/tools.ini

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
[gettext]
22
description=GNU gettext Win32 porting - the GNU translation tool (useful tools for pygettext, a standard library module)
3-
url=http://sourceforge.net/projects/gettext
3+
url=https://sourceforge.net/projects/gettext
44

55
[julia]
66
description=The Julia Langage
7-
url=http://julialang.org/
7+
url=https://julialang.org/
88

99
[mingw32]
1010
description=C/C++ and Fortran compilers (Mingwpy static toolchain version)
1111
url=https://github.com/numpy/numpy/wiki/Mingw-static-toolchain
1212

1313
[pandoc]
1414
description=a universal document converter
15-
url=http://pandoc.org/
15+
url=https://pandoc.org/
1616

1717
[r]
1818
description=The R Project for Statistical Computing
19-
url=http://www.r-project.org
19+
url=https://www.r-project.org
2020

2121
[scite]
2222
description=SCIntilla based Text Editor - Multilanguage, powerful and light-weight text editor
2323
url=http://www.scintilla.org/SciTE.html
2424

2525
[tortoisehg]
2626
description=Set of graphical tools and a shell extension for the Mercurial distributed revision control system
27-
url=http://tortoisehg.bitbucket.org
27+
url=https://tortoisehg.bitbucket.io/
2828

2929
[winmerge]
3030
description=Open Source differencing and merging tool for Windows
@@ -33,3 +33,7 @@ url=http://winmerge.org
3333
[nodejs]
3434
description=a JavaScript runtime built on Chrome's V8 JavaScript engine
3535
url=https://nodejs.org
36+
37+
[ffmpeg]
38+
description=a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata
39+
url=https://ffmpeg.org

‎winpython/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def get_julia_version(path):
230230

231231
def get_nodejs_version(path):
232232
"""Return version of the Nodejs installed in *path*"""
233-
return exec_shell_cmd('npm version', path).split(" node: '")[1].split("'")[0]
233+
return exec_shell_cmd('node -v', path).splitlines()[0]
234234

235235
def get_thg_version(path):
236236
"""Return version of TortoiseHg installed in *path*"""
@@ -243,6 +243,10 @@ def get_pandoc_version(path):
243243
"""Return version of the Pandoc executable in *path*"""
244244
return exec_shell_cmd('pandoc -v', path).splitlines()[0].split(" ")[-1]
245245

246+
def get_ffmpeg_version(path):
247+
"""Return version of the Pandoc executable in *path*"""
248+
return exec_shell_cmd('ffmpeg -version', path).splitlines()[0].split(" ")[2]
249+
246250
def python_query(cmd, path):
247251
"""Execute Python command using the Python interpreter located in *path*"""
248252
return exec_shell_cmd('python -c "%s"' % cmd, path).splitlines()[0]

0 commit comments

Comments
 (0)
0