Merge c580ae355bb18b3d3d0aaee0e9220f34441995e0 into 3cef4310457a106ce301a1061d5299d15b041785

.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

ffmpeg/_ffmpeg.py

@@ -1,6 +1,4 @@
 from __future__ import unicode_literals
-
-from past.builtins import basestring
 from ._utils import basestring
 
 from .nodes import (

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

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
+    basestring = basestring
-    from builtins import basestring
 
 
 def _recursive_repr(item):

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

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
 
 

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 ._utils import basestring
-from builtins import object
+from ._utils import escape_chars
+from ._utils import get_hash_int
 import os
 
 

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(
+    in_data = bytearray([random.randint(0, 255) for _ in range(frame_size * frame_count)])
-        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()
 

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'],
+    install_requires=[],
-    extras_require={
+    extras_require={'dev': dev_requires},
-        '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',
-        ]
-    },
     classifiers=[
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',

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