Add tox support

This commit is contained in:
Karl Kroening 2017-06-13 23:18:19 -06:00
parent cd3d3715b8
commit d0e226e263
6 changed files with 58 additions and 13 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
dist/ dist/
ffmpeg/tests/sample_data/dummy2.mp4 ffmpeg/tests/sample_data/dummy2.mp4
venv* venv*
.tox/

5
.python-version Normal file
View File

@ -0,0 +1,5 @@
3.3.6
3.4.6
3.5.3
3.6.1
jython-2.7.0

View File

@ -2,8 +2,18 @@ language: python
before_install: before_install:
- curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz - curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz
- tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz - tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz
env:
- TOX_ENV=py27
- TOX_ENV=py33
- TOX_ENV=py34
- TOX_ENV=py35
- TOX_ENV=py36
- TOX_ENV=pypy
install: install:
- pip install -r requirements.txt - pip install tox
script: script:
- export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH - export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH
- py.test - tox -e $TOX_ENV
cache:
directories:
- .tox

View File

@ -1,2 +1,4 @@
future
pytest pytest
sphinx sphinx
tox

View File

@ -64,15 +64,29 @@ misc_keywords = [
keywords = misc_keywords + file_formats + filter_names keywords = misc_keywords + file_formats + filter_names
setup( setup(
name = 'ffmpeg-python', name='ffmpeg-python',
packages = ['ffmpeg'], packages=['ffmpeg'],
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',
author_email = 'karlk@kralnet.us', author_email='karlk@kralnet.us',
url = 'https://github.com/kkroening/ffmpeg-python', url='https://github.com/kkroening/ffmpeg-python',
download_url = download_url, download_url=download_url,
classifiers = [], keywords=keywords,
keywords = keywords, long_description=long_description,
long_description = long_description, install_requires=['future'],
classifiers=[
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
) )

13
tox.ini Normal file
View File

@ -0,0 +1,13 @@
# Tox (https://tox.readthedocs.io/) is a tool for running tests
# in multiple virtualenvs. This configuration file will run the
# test suite on all supported python versions. To use it, "pip install tox"
# and then run "tox" from this directory.
[tox]
envlist = py27, py33, py34, py35, py36, pypy
[testenv]
commands = py.test
deps =
future
pytest