reverted wrong setuptools changes and enhanced setup script

Author: hhromic

setup.cfg

@@ -1,25 +1,5 @@
 [metadata]
 description-file = README.md
-name = twitter-toolbox
-version = 1.1.0
-description = Twitter Toolbox for Python
-long_description = Twitter Toolbox for Python
-author = Hugo Hromic
-author_email = hhromic@gmail.com
-maintainer = Hugo Hromic
-maintainer_email = hhromic@gmail.com
-url = https://github.com/hhromic/python-twitter-toolbox
-download_url = https://github.com/hhromic/python-twitter-toolbox/tarball/1.1.0
-requires = tweepy, colorlog
-install_requires = tweepy, colorlog
-provides = twtoolbox
-keywords = twitter, api, cli, toolbox
-classifiers = Environment :: Console
-license = Apache-2.0
-platforms = all
-
-[options.package_data]
-twtoolbox = defaults.cfg
 
 [bdist_wheel]
 universal = 1

setup.py

@@ -1,17 +1,43 @@
 #!/usr/bin/env python
+# pylint: disable=missing-docstring
 
 """Main setup script."""
 
 import ast
 from os import path
 from setuptools import setup, find_packages
 
-CLI_TREE = ast.parse(open(path.join("twtoolbox", "cli.py")).read())
-CONSOLE_SCRIPTS = ["%s = twtoolbox.cli:%s" % (fn.name.replace("_", "-"), fn.name)
-                   for fn in CLI_TREE.body
-                   if isinstance(fn, ast.FunctionDef) and fn.name.startswith('tt_')]
+VERSION = "1.2.0"
+DESCRIPTION = "Twitter Toolbox for Python"
+AUTHOR = "Hugo Hromic"
+AUTHOR_EMAIL = "hhromic@gmail.com"
+URL = "https://github.com/hhromic/python-twitter-toolbox"
+
+def read_long_description():
+    with open("README.rst") as reader:
+        return reader.read()
+
+def generate_console_scripts():
+    with open(path.join("twtoolbox", "cli.py")) as reader:
+        cli_tree = ast.parse(reader.read())
+    return ["%s = twtoolbox.cli:%s" % (fn.name.replace("_", "-"), fn.name)
+            for fn in cli_tree.body if isinstance(fn, ast.FunctionDef) and
+            fn.name.startswith('tt_')]
 
 setup(
+    name="twitter-toolbox", version=VERSION, description=DESCRIPTION,
+    author=AUTHOR, author_email=AUTHOR_EMAIL,
+    maintainer=AUTHOR, maintainer_email=AUTHOR_EMAIL,
+    url=URL, download_url=URL + "/tarball/" + VERSION,
+    requires=["tweepy", "colorlog"],
+    install_requires=["tweepy", "colorlog"],
+    provides=["twtoolbox"],
+    keywords=["twitter", "api", "cli", "toolbox"],
+    classifiers=["Environment :: Console"],
+    license="Apache-2.0",
+    platforms=["all"],
+    long_description=read_long_description(),
     packages=find_packages(),
-    entry_points={"console_scripts": CONSOLE_SCRIPTS},
+    package_data={"twtoolbox": ["defaults.cfg"]},
+    entry_points={"console_scripts": generate_console_scripts()},
 )