prepare for 3.6.5 release

Kevin Burke · Kevin Burke · commit 7f900532d4ea · 2014-02-04T10:44:17.000-08:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,13 +3,13 @@ twilio-python Changelog
 
 Here you can see the full list of changes between each twilio-python release.
 
-Develop Branch
+Version 3.6.5
 --------------
 
 - Remove unittest2 dependency.
 - Tests no longer run against Python 2.5.
 - update(), delete() work on Application, Transcription and UsageTrigger
-instance classes.
+  instance classes.
 
 Version 3.6.4
 -------------
@@ -26,12 +26,13 @@ Version 3.6.3
 Released October 21, 2013
 
 - Adds support for filtering by type to IncomingPhoneNumbers.
-- Adds support for filtering for mobile numbers to both
-IncomingPhoneNumbers and AvailablePhoneNumbers.
+
+- Adds support for filtering for mobile numbers to both IncomingPhoneNumbers
+  and AvailablePhoneNumbers.
 
 
 Version 3.6.2
-------------
+-------------
 
 Released on September 24, 2013
 
@@ -43,8 +44,7 @@ Version 3.6.0, 3.6.1
 
 Released on September 18, 2013
 
-- Adds support for the new Message and SIP resources to the REST
-API client.
+- Adds support for the new Message and SIP resources to the REST API client.
 - Adds support for the new Message verb to the TwiML generator.
 
 
@@ -54,7 +54,7 @@ Version 3.5.3, 3.5.4
 Released on September 6, 2013
 
 - twilio-python now includes an SSL certfication file to ensure that
-connections to api.twilio.com don't fail with SSLError.
+  connections to api.twilio.com don't fail with SSLError.
 
 Version 3.5.2
 -------------
diff --git a/docs/conf.py b/docs/conf.py
@@ -14,6 +14,8 @@
 import sys, os
 from datetime import datetime
 
+from twilio import __version_info__
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -58,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.6'
+version = '.'.join(__version_info__[:2])
 # The full version, including alpha/beta/rc tags.
-release = '3.6.4'
+release = '.'.join(__version_info__)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/twilio/__init__.py b/twilio/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = ('3', '6', '4')
+__version_info__ = ('3', '6', '5')
 __version__ = '.'.join(__version_info__)
 
 
