Commit 5c4a5c7
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,10 +1,22 @@ | |||
| 1 | 1 | from __future__ import unicode_literals | |
| 2 | - | ||
| 3 | - from . import _filters, _ffmpeg, _run, _probe | ||
| 4 | - from ._filters import * | ||
| 2 | + from . import nodes | ||
| 3 | + from . import _ffmpeg | ||
| 4 | + from . import _filters | ||
| 5 | + from . import _probe | ||
| 6 | + from . import _run | ||
| 7 | + from . import _view | ||
| 8 | + from .nodes import * | ||
| 5 | 9 | from ._ffmpeg import * | |
| 10 | + from ._filters import * | ||
| 11 | + from ._probe import * | ||
| 6 | 12 | from ._run import * | |
| 7 | 13 | from ._view import * | |
| 8 | - from ._probe import * | ||
| 9 | 14 | ||
| 10 | - __all__ = _filters.__all__ + _ffmpeg.__all__ + _run.__all__ + _view.__all__ + _probe.__all__ | ||
| 15 | + __all__ = ( | ||
| 16 | + nodes.__all__ | ||
| 17 | + + _ffmpeg.__all__ | ||
| 18 | + + _probe.__all__ | ||
| 19 | + + _run.__all__ | ||
| 20 | + + _view.__all__ | ||
| 21 | + + _filters.__all__ | ||
| 22 | + ) | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -8,7 +8,7 @@ | |||
| 8 | 8 | def filter_multi_output(stream_spec, filter_name, *args, **kwargs): | |
| 9 | 9 | """Apply custom filter with one or more outputs. | |
| 10 | 10 | ||
| 11 | - This is the same as ``filter_`` except that the filter can produce more than one output. | ||
| 11 | + This is the same as ``filter`` except that the filter can produce more than one output. | ||
| 12 | 12 | ||
| 13 | 13 | To reference an output stream, use either the ``.stream`` operator or bracket shorthand: | |
| 14 | 14 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -336,3 +336,8 @@ def filter_operator(name=None): | |||
| 336 | 336 | ||
| 337 | 337 | def output_operator(name=None): | |
| 338 | 338 | return stream_operator(stream_classes={OutputStream}, name=name) | |
| 339 | + | ||
| 340 | + | ||
| 341 | + __all__ = [ | ||
| 342 | + 'Stream', | ||
| 343 | + ] | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,33 +1,39 @@ | |||
| 1 | - alabaster==0.7.10 | ||
| 2 | - apipkg==1.4 | ||
| 3 | - Babel==2.5.1 | ||
| 4 | - certifi==2017.7.27.1 | ||
| 1 | + alabaster==0.7.12 | ||
| 2 | + atomicwrites==1.3.0 | ||
| 3 | + attrs==19.1.0 | ||
| 4 | + Babel==2.7.0 | ||
| 5 | + certifi==2019.3.9 | ||
| 5 | 6 | chardet==3.0.4 | |
| 6 | 7 | docutils==0.14 | |
| 7 | - execnet==1.5.0 | ||
| 8 | - funcsigs==1.0.2 | ||
| 9 | - future==0.16.0 | ||
| 10 | - idna==2.6 | ||
| 11 | - imagesize==0.7.1 | ||
| 12 | - Jinja2==2.9.6 | ||
| 13 | - MarkupSafe==1.0 | ||
| 14 | - mock==2.0.0 | ||
| 15 | - pbr==4.0.3 | ||
| 16 | - pluggy==0.5.2 | ||
| 17 | - py==1.4.34 | ||
| 18 | - Pygments==2.2.0 | ||
| 19 | - pytest==3.2.3 | ||
| 20 | - pytest-forked==0.2 | ||
| 21 | - pytest-mock==1.10.0 | ||
| 22 | - pytest-runner==3.0 | ||
| 23 | - pytest-xdist==1.22.2 | ||
| 24 | - pytz==2017.3 | ||
| 25 | - requests==2.18.4 | ||
| 26 | - six==1.11.0 | ||
| 8 | + filelock==3.0.12 | ||
| 9 | + future==0.17.1 | ||
| 10 | + idna==2.8 | ||
| 11 | + imagesize==1.1.0 | ||
| 12 | + importlib-metadata==0.17 | ||
| 13 | + Jinja2==2.10.1 | ||
| 14 | + MarkupSafe==1.1.1 | ||
| 15 | + more-itertools==7.0.0 | ||
| 16 | + packaging==19.0 | ||
| 17 | + pluggy==0.12.0 | ||
| 18 | + py==1.8.0 | ||
| 19 | + Pygments==2.4.2 | ||
| 20 | + pyparsing==2.4.0 | ||
| 21 | + pytest==4.6.1 | ||
| 22 | + pytest-mock==1.10.4 | ||
| 23 | + pytz==2019.1 | ||
| 24 | + requests==2.22.0 | ||
| 25 | + six==1.12.0 | ||
| 27 | 26 | snowballstemmer==1.2.1 | |
| 28 | - Sphinx==1.6.5 | ||
| 29 | - sphinxcontrib-websupport==1.0.1 | ||
| 30 | - tox==2.9.1 | ||
| 31 | - typing==3.6.2 | ||
| 32 | - urllib3==1.22 | ||
| 33 | - virtualenv==15.1.0 | ||
| 27 | + Sphinx==2.1.0 | ||
| 28 | + sphinxcontrib-applehelp==1.0.1 | ||
| 29 | + sphinxcontrib-devhelp==1.0.1 | ||
| 30 | + sphinxcontrib-htmlhelp==1.0.2 | ||
| 31 | + sphinxcontrib-jsmath==1.0.1 | ||
| 32 | + sphinxcontrib-qthelp==1.0.2 | ||
| 33 | + sphinxcontrib-serializinghtml==1.1.3 | ||
| 34 | + toml==0.10.0 | ||
| 35 | + tox==3.12.1 | ||
| 36 | + urllib3==1.25.3 | ||
| 37 | + virtualenv==16.6.0 | ||
| 38 | + wcwidth==0.1.7 | ||
| 39 | + zipp==0.5.1 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -69,9 +69,11 @@ | |||
| 69 | 69 | install_requires=['future'], | |
| 70 | 70 | extras_require={ | |
| 71 | 71 | 'dev': [ | |
| 72 | - 'future', | ||
| 73 | - 'pytest', | ||
| 74 | - 'pytest-mock', | ||
| 72 | + 'future==0.17.1', | ||
| 73 | + 'pytest-mock==1.10.4', | ||
| 74 | + 'pytest==4.6.1', | ||
| 75 | + 'Sphinx==2.1.0', | ||
| 76 | + 'tox==3.12.1', | ||
| 75 | 77 | ], | |
| 76 | 78 | }, | |
| 77 | 79 | classifiers=[ | |
0 commit comments