Merge branch 'master' into bug_pylint_2721

2 files changed, 25 insertions, 28 deletions

diff --git a/astroid/__pkginfo__.py b/astroid/__pkginfo__.py
index ea870840..55e89629 100644
--- a/astroid/__pkginfo__.py
+++ b/astroid/__pkginfo__.py
@@ -17,10 +17,6 @@
 
 """astroid packaging information"""
 
-distname = "astroid"
-
-modname = "astroid"
-
 version = "2.3.0"
 numversion = tuple(int(elem) for elem in version.split(".") if elem.isdigit())
 
diff --git a/setup.py b/setup.py
index 2ad90aac..c426da0c 100644
--- a/setup.py
+++ b/setup.py
@@ -19,34 +19,35 @@ from setuptools.command import install_lib
 
 real_path = os.path.realpath(__file__)
 astroid_dir = os.path.dirname(real_path)
-pkginfo = os.path.join(astroid_dir, 'astroid', '__pkginfo__.py')
+pkginfo = os.path.join(astroid_dir, "astroid", "__pkginfo__.py")
 
-with open(pkginfo, 'rb') as fobj:
-    exec(compile(fobj.read(), pkginfo, 'exec'), locals())
+with open(pkginfo, "rb") as fobj:
+    exec(compile(fobj.read(), pkginfo, "exec"), locals())
 
-with open(os.path.join(astroid_dir, 'README.rst')) as fobj:
+with open(os.path.join(astroid_dir, "README.rst")) as fobj:
     long_description = fobj.read()
 
 
 def install():
-    return setup(name = distname,
-                 version = version,
-                 license = license,
-                 description = description,
-                 long_description = long_description,
-                 classifiers = classifiers,
-                 author = author,
-                 author_email = author_email,
-                 url = web,
-                 python_requires='>=3.4.*',
-                 install_requires = install_requires,
-                 extras_require=extras_require,
-                 packages=find_packages(exclude=['astroid.tests']) + ['astroid.brain'],
-                 setup_requires=['pytest-runner'],
-                 test_suite='test',
-                 tests_require=['pytest'],
-                 )
-
-
-if __name__ == '__main__' :
+    return setup(
+        name="astroid",
+        version=version,
+        license=license,
+        description=description,
+        long_description=long_description,
+        classifiers=classifiers,
+        author=author,
+        author_email=author_email,
+        url=web,
+        python_requires=">=3.4.*",
+        install_requires=install_requires,
+        extras_require=extras_require,
+        packages=find_packages(exclude=["astroid.tests"]) + ["astroid.brain"],
+        setup_requires=["pytest-runner"],
+        test_suite="test",
+        tests_require=["pytest"],
+    )
+
+
+if __name__ == "__main__":
     install()