Make setup.py test work

kkroening · Jun 14, 2017 · 6960751 · 6960751
1 parent d0e226e
commit 6960751
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 .cache
+.eggs
+.tox/
 dist/
 ffmpeg/tests/sample_data/dummy2.mp4
+ffmpeg_python.egg-info/
 venv*
-.tox/
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 future
 pytest
+pytest-runner
 sphinx
 tox
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[aliases]
+test=pytest
diff --git a/setup.py b/setup.py
@@ -1,5 +1,4 @@
-from distutils.core import setup
-from ffmpeg._filters import __all__ as filter_names
+from setuptools import setup
 from textwrap import dedent
 import subprocess
 
@@ -61,11 +60,13 @@ def get_current_commit_hash():
     'wrapper',
 ]
 
-keywords = misc_keywords + file_formats + filter_names
+keywords = misc_keywords + file_formats
 
 setup(
     name='ffmpeg-python',
     packages=['ffmpeg'],
+    setup_requires=['pytest-runner'],
+    tests_require=['pytest'],
     version='0.1.5',
     description='Python bindings for FFmpeg - with support for complex filtering',
     author='Karl Kroening',