Make setup.py test work

This commit is contained in:
Karl Kroening 2017-06-13 23:29:52 -06:00
parent d0e226e263
commit 6960751de0
4 changed files with 10 additions and 4 deletions

4
.gitignore vendored
View File

@ -1,5 +1,7 @@
.cache .cache
.eggs
.tox/
dist/ dist/
ffmpeg/tests/sample_data/dummy2.mp4 ffmpeg/tests/sample_data/dummy2.mp4
ffmpeg_python.egg-info/
venv* venv*
.tox/

View File

@ -1,4 +1,5 @@
future future
pytest pytest
pytest-runner
sphinx sphinx
tox tox

2
setup.cfg Normal file
View File

@ -0,0 +1,2 @@
[aliases]
test=pytest

View File

@ -1,5 +1,4 @@
from distutils.core import setup from setuptools import setup
from ffmpeg._filters import __all__ as filter_names
from textwrap import dedent from textwrap import dedent
import subprocess import subprocess
@ -61,11 +60,13 @@ misc_keywords = [
'wrapper', 'wrapper',
] ]
keywords = misc_keywords + file_formats + filter_names keywords = misc_keywords + file_formats
setup( setup(
name='ffmpeg-python', name='ffmpeg-python',
packages=['ffmpeg'], packages=['ffmpeg'],
setup_requires=['pytest-runner'],
tests_require=['pytest'],
version='0.1.5', version='0.1.5',
description='Python bindings for FFmpeg - with support for complex filtering', description='Python bindings for FFmpeg - with support for complex filtering',
author='Karl Kroening', author='Karl Kroening',