8000 Add tox support · dreamCodeMan/ffmpeg-python@d0e226e · GitHub
[go: up one dir, main page]
Skip to content

Commit d0e226e

Browse files
kkroeningkkroening
committed
Add tox support
1 parent cd3d371 commit d0e226e

File tree

6 files changed

+58
-13
lines changed

6 files changed

+58
-13
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
dist/
33
ffmpeg/tests/sample_data/dummy2.mp4
44
venv*
5+
.tox/

‎.python-version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
3.3.6
2+
3.4.6
3+
3.5.3
4+
3.6.1
5+
jython-2.7.0

‎.travis.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,18 @@ language: python
22
before_install:
33
- curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz
44
- tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz
5+
env:
6+
- TOX_ENV=py27
7+
- TOX_ENV=py33
8+
- TOX_ENV=py34
9+
- TOX_ENV=py35
10+
- TOX_ENV=py36
11+
- TOX_ENV=pypy
512
install:
6-< 8000 div class="diff-text-inner"> - pip install -r requirements.txt
13+
- pip install tox
714
script:
815
- export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH
9-
- py.test
16+
- tox -e $TOX_ENV
17+
cache:
18+
directories:
19+
- .tox

‎requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
future
12
pytest
23
sphinx
4+
tox

‎setup.py

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,29 @@ def get_current_commit_hash():
6464
keywords = misc_keywords + file_formats + filter_names
6565

6666
setup(
67-
name = 'ffmpeg-python',
68-
packages = ['ffmpeg'],
69-
version = '0.1.5',
70-
description = 'Python bindings for FFmpeg - with support for complex filtering',
71-
author = 'Karl Kroening',
72-
author_email = 'karlk@kralnet.us',
73-
url = 'https://github.com/kkroening/ffmpeg-python',
74-
download_url = download_url,
75-
classifiers = [],
76-
keywords = keywords,
77-
long_description = long_description,
67+
name='ffmpeg-python',
68+
packages=['ffmpeg'],
69+
version='0.1.5',
70+
description='Python bindings for FFmpeg - with support for complex filtering',
71+
author='Karl Kroening',
72+
author_email='karlk@kralnet.us',
73+
url='https://github.com/kkroening/ffmpeg-python',
74+
download_url=download_url,
75+
keywords=keywords,
76+
long_description=long_description,
77+
install_requires=['future'],
78+
classifiers=[
79+
'Intended Audience :: Developers',
80+
'License :: OSI Approved :: Apache Software License',
81+
'Natural Language :: English',
82+
'Operating System :: OS Independent',
83+
'Programming Language :: Python',
84+
'Programming Language :: Python :: 2',
85+
'Programming Language :: Python :: 2.7',
86+
'Programming Language :: Python :: 3',
87+
'Programming Language :: Python :: 3.3',
88+
'Programming Language :: Python :: 3.4',
89+
'Programming Language :: Python :: 3.5',
90+
'Programming Language :: Python :: 3.6',
91+
],
7892
)

‎tox.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Tox (https://tox.readthedocs.io/) is a tool for running tests
2+
# in multiple virtualenvs. This configuration file will run the
3+
# test suite on all supported python versions. To use it, "pip install tox"
4+
# and then run "tox" from this directory.
5+
6+
[tox]
7+
envlist = py27, py33, py34, py35, py36, pypy
8+
9+
[testenv]
10+
commands = py.test
11+
deps =
12+
future
13+
pytest

0 commit comments

Comments
 (0)
0