From 4327ff30dffb1b17945b08655daf2b16998a239b Mon Sep 17 00:00:00 2001
From: Mike Helmick <mikehelmick@me.com>
Date: Thu, 30 May 2013 17:48:47 -0400
Subject: [PATCH] Cleaning up a bit

[ci skip]
---
 HISTORY.rst |  2 ++
 MANIFEST.in |  2 +-
 setup.py    | 15 ++++-----------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 6338d83..d0b4a83 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,6 +5,7 @@ History
 
 2.10.1 (2013-05-29)
 ++++++++++++++++++
+
 - More test coverage!
 - Fix ``search_gen``
 - Fixed ``get_lastfunction_header`` to actually do what its docstring says, returns ``None`` if header is not found
@@ -16,6 +17,7 @@ History
 
 2.10.0 (2013-05-21)
 ++++++++++++++++++
+
 - Added ``get_retweeters_ids`` method
 - Fixed ``TwythonDeprecationWarning`` on camelCase functions if the camelCase was the same as the PEP8 function (i.e. ``Twython.retweet`` did not change)
 - Fixed error message bubbling when error message returned from Twitter was not an array (i.e. if you try to retweet something twice, the error is not found at index 0)
diff --git a/MANIFEST.in b/MANIFEST.in
index 536f516..af9021f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include LICENSE README.rst HISTORY.rst test_twython.py requirements.txt
\ No newline at end of file
+include README.rst HISTORY.rst LICENSE
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 045d9e0..1952b26 100755
--- a/setup.py
+++ b/setup.py
@@ -18,26 +18,19 @@ if sys.argv[-1] == 'publish':
     sys.exit()
 
 setup(
-    # Basic package information.
     name='twython',
     version=__version__,
-    packages=packages,
-
-    # Packaging options.
-    include_package_data=True,
-
-    # Package dependencies.
     install_requires=['requests==1.2.2', 'requests_oauthlib==0.3.2'],
-
-    # Metadata for PyPI.
     author='Ryan McGrath',
     author_email='ryan@venodesigns.net',
-    license='MIT License',
-    url='http://github.com/ryanmcgrath/twython/tree/master',
+    license=open('LICENSE').read(),
+    url='https://github.com/ryanmcgrath/twython/tree/master',
     keywords='twitter search api tweet twython stream',
     description='Actively maintained, pure Python wrapper for the Twitter API. Supports both normal and streaming Twitter APIs',
     long_description=open('README.rst').read() + '\n\n' +
                      open('HISTORY.rst').read(),
+    include_package_data=True,
+    packages=packages,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',