Merge branch 'release/1.0.0'

diff --git a/docs/conf.py b/docs/conf.py
index d1a1ce111c3316b0341df016ec55928f3e77a181..2da9bacca98ccdc360546bd182206e7749a05b4a 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.
-version = '0.12.1'
+version = '1.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.12.1'
+release = '1.0.0'
 
 # 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 b7ebe9cbfe271fcb9e4d5ab6f7f9766edd68086b..2b09f1b20f16f0ee0721ce5052f1ae47861a885e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 from setuptools import setup, find_packages
 
-install_requirements = ['six==1.5.2', 'pytz', 'tzlocal']
+install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
 
-version = '0.12.1'
+version = '1.0.0'
 
 try:
     import importlib