Fixing setup py install dependencies

Author: gabor-boros

rethinkdb/__init__.py

@@ -12,12 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import os
-
 import imp
+import pkg_resources
 
 from rethinkdb import errors, version
-from rethinkdb import net
-import pkg_resources
 
 
 # The builtins here defends against re-importing something obscuring `object`.
@@ -35,7 +33,16 @@ class RethinkDB(builtins.object):
     def __init__(self):
         super(RethinkDB, self).__init__()
 
-        from rethinkdb import _dump, _export, _import, _index_rebuild, _restore, ast, query, net
+        from rethinkdb import (
+            _dump,
+            _export,
+            _import,
+            _index_rebuild,
+            _restore,
+            ast,
+            query,
+            net
+        )
 
         self._dump = _dump
         self._export = _export

setup.py

@@ -94,7 +94,9 @@
             'rethinkdb-repl = rethinkdb.__main__:startInterpreter'
         ]
     },
-    setup_requires=['pytest-runner'],
-    test_suite='tests',
-    tests_require=['pytest']
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    install_requires=[
+        'six'
+    ],
+    test_suite='tests'
 )