Consistent version numbering for 0.2.5 release.

jkeyes · jkeyes · commit 7b3ddff35181 · 2013-02-27T13:09:55.000Z
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* 0.2.5
+   * Consistent version numbering (docs and code).
 * 0.2.4
    * Handle invalid JSON responses. (https://github.com/marselester)
    * Fix to doctests to pass with current Intercom dummy API.
diff --git a/docs/conf.py b/docs/conf.py
@@ -44,14 +44,14 @@
 
 # General information about the project.
 project = u'python-intercom'
-copyright = u'2012, John Keyes'
+copyright = u'2013, John Keyes'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.4'
+version = '0.2.5'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/intercom/intercom.py b/intercom/intercom.py
@@ -3,7 +3,7 @@
 #
 # License: http://jkeyes.mit-license.org/
 #
-""" intercom module 
+""" intercom module
 
 All of the API requests are created, and the API responses are parsed here.
 
@@ -74,7 +74,7 @@ class Intercom(object):
     def _call(cls, method, url, params=None):
         """ Construct an API request, send it to the API, and parse the response. """
         req_params = {}
-        headers = { 'User-Agent': 'python-intercom/0.1', 'Accept': 'application/json' }
+        headers = { 'User-Agent': 'python-intercom/0.2.5', 'Accept': 'application/json' }
         if method in ('POST', 'PUT'):
             headers['content-type'] = 'application/json'
             req_params['data'] = json.dumps(params)
@@ -83,20 +83,20 @@ def _call(cls, method, url, params=None):
         req_params['headers'] = headers
 
         resp = requests.request(method, url, timeout=Intercom.timeout, \
-                auth=(Intercom.app_id, Intercom.api_key), 
+                auth=(Intercom.app_id, Intercom.api_key),
                 **req_params)
         return resp
 
     @classmethod
     def _create_or_update_user(cls, method, **kwargs):
         """ Used by create_user and update_user. """
-        user_dict = Intercom._call(method, Intercom.api_endpoint + 'users', 
+        user_dict = Intercom._call(method, Intercom.api_endpoint + 'users',
                 params=kwargs)
         return user_dict
 
     @classmethod
     def get_users(cls):
-        """ Return a dict for the user represented by the specified email or user_id. 
+        """ Return a dict for the user represented by the specified email or user_id.
 
         >>> result = Intercom.get_users()
         >>> type(result)
@@ -110,7 +110,7 @@ def get_users(cls):
 
     @classmethod
     def get_user(cls, email=None, user_id=None):
-        """ Return a dict for the user represented by the specified email or user_id. 
+        """ Return a dict for the user represented by the specified email or user_id.
 
         >>> user = Intercom.get_user(user_id='123')
         >>> user['name']
@@ -123,9 +123,9 @@ def get_user(cls, email=None, user_id=None):
         return user_dict
 
     @classmethod
-    def create_user(cls, user_id=None, email=None, name=None, created_at=None, 
+    def create_user(cls, user_id=None, email=None, name=None, created_at=None,
             custom_data=None, last_seen_ip=None, last_seen_user_agent=None):
-        """ Create a user from the available parameters. 
+        """ Create a user from the available parameters.
 
         >>> from datetime import datetime
         >>> import time
@@ -139,14 +139,14 @@ def create_user(cls, user_id=None, email=None, name=None, created_at=None,
         u'smuggler'
 
         """
-        return Intercom._create_or_update_user('POST', user_id=user_id, email=email, 
-            name=name, created_at=created_at, custom_data=custom_data, 
+        return Intercom._create_or_update_user('POST', user_id=user_id, email=email,
+            name=name, created_at=created_at, custom_data=custom_data,
             last_seen_ip=last_seen_ip, last_seen_user_agent=last_seen_user_agent)
 
     @classmethod
-    def update_user(cls, user_id=None, email=None, name=None, created_at=None, 
+    def update_user(cls, user_id=None, email=None, name=None, created_at=None,
             custom_data=None, last_seen_ip=None, last_seen_user_agent=None):
-        """ Update a user with the available parameters. 
+        """ Update a user with the available parameters.
 
         >>> user = Intercom.get_user(user_id='123')
         >>> user['name']
@@ -157,31 +157,31 @@ def update_user(cls, user_id=None, email=None, name=None, created_at=None,
 
         """
         return Intercom._create_or_update_user('PUT', user_id=user_id, email=email,
-            name=name, created_at=created_at, custom_data=custom_data, 
+            name=name, created_at=created_at, custom_data=custom_data,
             last_seen_ip=last_seen_ip, last_seen_user_agent=last_seen_user_agent)
 
     @classmethod
     def create_impression(cls, user_id=None, email=None, user_ip=None,
         user_agent=None, location=None):
-        """ Create an impression. 
+        """ Create an impression.
 
         >>> result = Intercom.create_impression(email="somebody@example.com",
         ... user_agent="MyApp/1.0", user_ip="2.3.4.5")
         >>> result['unread_messages']
         1
 
         """
-        params = { 'email': email, 'user_id': user_id, 'user_ip': user_ip, 
+        params = { 'email': email, 'user_id': user_id, 'user_ip': user_ip,
                 'user_agent': user_agent, 'location': location }
-        user_dict = Intercom._call('POST', Intercom.api_endpoint + 'users/impressions', 
+        user_dict = Intercom._call('POST', Intercom.api_endpoint + 'users/impressions',
                 params=params)
         return user_dict
 
     @classmethod
     def get_message_threads(cls, user_id=None, email=None, thread_id=None):
-        """ If a thread_id is specified, this returns a specific MessageThread 
+        """ If a thread_id is specified, this returns a specific MessageThread
         (if it can find one), otherwise it returns all MessageThreads for the
-        particular user. 
+        particular user.
 
         >>> message_threads = Intercom.get_message_threads(email="somebody@example.com")
         >>> type(message_threads)
@@ -193,15 +193,15 @@ def get_message_threads(cls, user_id=None, email=None, thread_id=None):
 
         """
         params = { 'email': email, 'user_id': user_id, 'thread_id': thread_id }
-        msg_dict = Intercom._call('GET', Intercom.api_endpoint + 'users/message_threads', 
-                params=params)        
+        msg_dict = Intercom._call('GET', Intercom.api_endpoint + 'users/message_threads',
+                params=params)
         return msg_dict
 
     @classmethod
     def create_message_thread(cls, user_id=None, email=None, body=None):
-        """ Create a MessageThread. 
+        """ Create a MessageThread.
 
-        >>> message_thread = Intercom.create_message_thread(email="somebody@example.com", 
+        >>> message_thread = Intercom.create_message_thread(email="somebody@example.com",
         ... body="Uh, everything's under control. Situation normal.")
         >>> message_thread['thread_id']
         5591
@@ -212,16 +212,16 @@ def create_message_thread(cls, user_id=None, email=None, body=None):
 
         """
         params = { 'email': email, 'user_id': user_id, 'body': body }
-        user_dict = Intercom._call('POST', Intercom.api_endpoint + 'users/message_threads', 
-                params=params)        
+        user_dict = Intercom._call('POST', Intercom.api_endpoint + 'users/message_threads',
+                params=params)
         return user_dict
 
     @classmethod
-    def reply_message_thread(cls, user_id=None, email=None, thread_id=None, 
+    def reply_message_thread(cls, user_id=None, email=None, thread_id=None,
             body=None, read=None):
         """ Reply to the specific thread.
 
-        >>> message_thread = Intercom.reply_message_thread(email="somebody@example.com", 
+        >>> message_thread = Intercom.reply_message_thread(email="somebody@example.com",
         ... thread_id=5591, body="If you're not talking to me you must be talking to someone")
         >>> len(message_thread)
         6
@@ -231,8 +231,8 @@ def reply_message_thread(cls, user_id=None, email=None, thread_id=None,
         2
 
         """
-        params = { 'email': email, 'user_id': user_id, 'thread_id': thread_id, 
+        params = { 'email': email, 'user_id': user_id, 'thread_id': thread_id,
             'body': body, 'read': read }
-        user_dict = Intercom._call('PUT', Intercom.api_endpoint + 'users/message_threads', 
+        user_dict = Intercom._call('PUT', Intercom.api_endpoint + 'users/message_threads',
                 params=params)
         return user_dict
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from setuptools import setup
 
 setup(name="python-intercom",
-    version='0.2.4',
+    version='0.2.5',
     description="Intercom API wrapper",
     long_description=open('README').read(),
     author="John Keyes",
