diff --git a/.travis.yml b/.travis.yml index c58274b..9859d03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +dist: xenial before_install: - > [ -f ffmpeg-release/ffmpeg ] || ( @@ -20,6 +21,9 @@ matrix: - python: 3.6 env: - TOX_ENV=py36 + - python: 3.7 + env: + - TOX_ENV=py37 - python: pypy env: - TOX_ENV=pypy diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py index 31e2b90..cfe6356 100644 --- a/ffmpeg/_ffmpeg.py +++ b/ffmpeg/_ffmpeg.py @@ -1,6 +1,4 @@ from __future__ import unicode_literals - -from past.builtins import basestring from ._utils import basestring from .nodes import ( diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index c9cbb7c..e023edd 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals from .dag import get_outgoing_edges, topo_sort from ._utils import basestring, convert_kwargs_to_cmd_line_args -from builtins import str from functools import reduce import collections import copy diff --git a/ffmpeg/_utils.py b/ffmpeg/_utils.py index 92d7611..ecc7376 100644 --- a/ffmpeg/_utils.py +++ b/ffmpeg/_utils.py @@ -1,6 +1,4 @@ from __future__ import unicode_literals -from builtins import str -from past.builtins import basestring import hashlib import sys import collections @@ -42,8 +40,7 @@ if sys.version_info.major >= 3: else: - # noinspection PyUnresolvedReferences,PyCompatibility - from builtins import basestring + basestring = basestring def _recursive_repr(item): diff --git a/ffmpeg/_view.py b/ffmpeg/_view.py index fb129fa..2b8b0eb 100644 --- a/ffmpeg/_view.py +++ b/ffmpeg/_view.py @@ -1,6 +1,4 @@ from __future__ import unicode_literals - -from builtins import str from .dag import get_outgoing_edges from ._run import topo_sort import tempfile diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 9564d7f..02ce83f 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals - from ._utils import get_hash, get_hash_int -from builtins import object from collections import namedtuple diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py index cacab8e..e4150c2 100644 --- a/ffmpeg/nodes.py +++ b/ffmpeg/nodes.py @@ -1,9 +1,8 @@ from __future__ import unicode_literals - -from past.builtins import basestring from .dag import KwargReprNode -from ._utils import escape_chars, get_hash_int -from builtins import object +from ._utils import basestring +from ._utils import escape_chars +from ._utils import get_hash_int import os diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 0d600f2..fd54157 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -1,7 +1,4 @@ from __future__ import unicode_literals -from builtins import bytes -from builtins import range -from builtins import str import ffmpeg import os import pytest @@ -694,9 +691,7 @@ def test_pipe(): cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE ) - in_data = bytes( - bytearray([random.randint(0, 255) for _ in range(frame_size * frame_count)]) - ) + in_data = bytearray([random.randint(0, 255) for _ in range(frame_size * frame_count)]) p.stdin.write(in_data) # note: this could block, in which case need to use threads p.stdin.close() diff --git a/setup.py b/setup.py index 0282c67..946fd5a 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,7 @@ from setuptools import setup from textwrap import dedent +import sys + version = '0.2.0' download_url = 'https://github.com/kkroening/ffmpeg-python/archive/v{}.zip'.format( @@ -57,6 +59,19 @@ misc_keywords = [ keywords = misc_keywords + file_formats + +dev_requires = [ + 'future>=0.17.1', + 'numpy>=1.16.4', + 'pytest-mock>=1.10.4', + 'pytest>=4.6.1', + 'tox>=3.12.1', +] + +if sys.version_info[0] >= 3: + dev_requires += ['Sphinx>=2.1.0'] + + setup( name='ffmpeg-python', packages=['ffmpeg'], @@ -70,17 +85,8 @@ setup( download_url=download_url, keywords=keywords, long_description=long_description, - install_requires=['future'], - extras_require={ - 'dev': [ - 'future==0.17.1', - 'numpy==1.16.4', - 'pytest-mock==1.10.4', - 'pytest==4.6.1', - 'Sphinx==2.1.0', - 'tox==3.12.1', - ] - }, + install_requires=[], + extras_require={'dev': dev_requires}, classifiers=[ 'Intended Audience :: Developers', 'License :: OSI Approved :: Apache Software License', diff --git a/tox.ini b/tox.ini index f86ec4b..397d41a 100644 --- a/tox.ini +++ b/tox.ini @@ -4,11 +4,10 @@ # and then run "tox" from this directory. [tox] -envlist = py27, py34, py35, py36, pypy +envlist = py27, py34, py35, py36, py37, pypy [testenv] commands = py.test -vv deps = - future pytest pytest-mock