Increment version # and update changelog.

Changelog file is no longer being maintained.
Github compare views will replace it.

diff --git a/CHANGELOG b/CHANGELOG
index 7efd33706b924da98993b967aad8fd0a1fc118bd..4e00f6f0273738523e6231e8522b8321c330a5f8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,13 @@
-All changes made to the library that might affect applications
-during upgrade will be listed here.
+This file will no longer be maintained. To get a listing of all changes between versions
+instead use Github compare views. Their URL's work like this:
 
+    http://github.com/joshthecoder/tweepy/compare/prev...next
+
+prev and next can be a tag, branch, or a commit SHA1.
+Example to view changes between versions 1.5 -> 1.6:
+
+    http://github.com/joshthecoder/tweepy/compare/1.5...1.6
 
-1.5 -> 1.6
-===========================
-+ API methods now allow for kargs that are not listed in the 
-  allowed_params list. This way Tweepy can support future parameters
-  twitter adds without having the patch the library.
 
 1.4 -> 1.5
 ===========================

diff --git a/setup.py b/setup.py
index c33e6f2cc4d06dbfcfaffcf4221c5844df322ef9..39041acf250fe5670ee63cd705684f5b73d0ea57 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name="tweepy",
-      version="1.5",
+      version="1.6",
       description="Twitter library for python",
       license="MIT",
       author="Joshua Roesslein",

diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index ae76b43ebf92b7da5ad0611d4aae0d87c596a553..4cc0bb35825ce3bdcbc7260b076d28063c05542a 100644 (file)
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -5,7 +5,7 @@
 """
 Tweepy Twitter API library
 """
-__version__ = '1.5'
+__version__ = '1.6'
 __author__ = 'Joshua Roesslein'
 __license__ = 'MIT'