Merge pull request #5460 from pradyunsg/simplify-setup

Cleanup the setup.py file

setup.py

@@ -18,30 +18,26 @@ def read(*parts):
 
 def find_version(*file_paths):
     version_file = read(*file_paths)
-    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
-                              version_file, re.M)
+    version_match = re.search(
+        r"^__version__ = ['\"]([^'\"]*)['\"]",
+        version_file,
+        re.M,
+    )
     if version_match:
         return version_match.group(1)
+
     raise RuntimeError("Unable to find version string.")
 
 
 long_description = read('README.rst')
 
-tests_require = [
-    'pytest',
-    'mock',
-    'pretend',
-    'scripttest>=1.3',
-    'virtualenv>=1.10',
-    'freezegun',
-]
-
-
 setup(
     name="pip",
     version=find_version("src", "pip", "__init__.py"),
     description="The PyPA recommended tool for installing Python packages.",
     long_description=long_description,
+
+    license='MIT',
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
@@ -55,13 +51,14 @@ setup(
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: CPython",
-        "Programming Language :: Python :: Implementation :: PyPy"
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
-    keywords='easy_install distutils setuptools egg virtualenv',
-    author='The pip developers',
-    author_email='python-virtualenv@groups.google.com',
     url='https://pip.pypa.io/',
-    license='MIT',
+    keywords='distutils easy_install egg setuptools wheel virtualenv',
+
+    author='The pip developers',
+    author_email='pypa-dev@groups.google.com',
+
     package_dir={"": "src"},
     packages=find_packages(
         where="src",
@@ -76,14 +73,11 @@ setup(
     entry_points={
         "console_scripts": [
             "pip=pip._internal:main",
-            "pip%s=pip._internal:main" % sys.version[:1],
-            "pip%s=pip._internal:main" % sys.version[:3],
+            "pip%s=pip._internal:main" % sys.version_info[:1],
+            "pip%s.%s=pip._internal:main" % sys.version_info[:2],
         ],
     },
-    tests_require=tests_require,
+
     zip_safe=False,
     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
-    extras_require={
-        'testing': tests_require,
-    },
 )