Merge branch 'python-3.3-to-3.5' into python-3.0-to-3.2

setup.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-import setuptools
+"""Setup script for the 'uncompyle6' distribution."""
 import sys
 
-"""Setup script for the 'uncompyle6' distribution."""
+import setuptools
 
 SYS_VERSION = sys.version_info[0:2]
 if not ((3, 0) <= SYS_VERSION < (3, 3)):
@@ -30,17 +30,17 @@ if not ((3, 0) <= SYS_VERSION < (3, 3)):
     raise Exception(mess)
 
 from __pkginfo__ import (
+    __version__,
     author,
     author_email,
+    classifiers,
+    entry_points,
     install_requires,
     license,
     long_description,
-    classifiers,
-    entry_points,
     modname,
     py_modules,
     short_desc,
-    __version__,
     web,
     zip_safe,
 )
@@ -60,7 +60,6 @@ setuptools.setup(
     py_modules=py_modules,
     test_suite="nose.collector",
     url=web,
-    tests_require=["nose>=1.0"],
     version=__version__,
     zip_safe=zip_safe,
 )