From: Rob Golding <rob@robgolding.com>
Date: Mon, 14 Mar 2016 13:30:56 +0000 (+0700)
Subject: Merge branch 'release/1.0.0'
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/7f87b5702df2d0dd3b0d1d1c546ba5db490c3860?hp=f97d6c209f065d708b497e377607e2a0e91e8f79

Merge branch 'release/1.0.0'
---

diff --git a/docs/conf.py b/docs/conf.py
index d1a1ce1..2da9bac 100644
--- 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 b7ebe9c..2b09f1b 100644
--- 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