From: Tomas Babej <tomasbabej@gmail.com>
Date: Mon, 14 Mar 2016 13:06:05 +0000 (+0100)
Subject: Merge pull request #44 from robgolding63/release/1.0.0
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/5a61375bb2dbec3b412fdf9a5ec9da6904bd8caa?hp=791af4dbe80d6c760589edf5aa9f2895558a83d2

Merge pull request #44 from robgolding63/release/1.0.0

1.0.0 Release
---

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