Bump version for 1.2.0 release

diff --git a/docs/conf.py b/docs/conf.py
index 596f56b0653d467c65dec0196c43defc6eb3433f..9c7dbedb0611ea2584c92127066d5e83aba3f0e9 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = u'2014, Rob Golding'
 # built documents.
 #
 # The short X.Y version.
 # built documents.
 #
 # The short X.Y version.

-version = '1.1.0'
+version = '1.2.0'

 # The full version, including alpha/beta/rc tags.
 # The full version, including alpha/beta/rc tags.

-release = '1.1.0'
+release = '1.2.0'

 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
index 360504e12a2700ccf499c9ae87d80e801838cc1e..510136ee97c5e0e16f824c63bc9d47c62305e4cf 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
 
 
 install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
 

-version = '1.1.0'
+version = '1.2.0'

 
 try:
     import importlib
 
 try:
     import importlib