Fix version conflicts we were hitting with six

diff --git a/setup.py b/setup.py
index a3cc055c0d00e375a000ea8ed1bb1d9c609cf8a3..6310a1bc980ce42fb390eee375fc0ed25155fffb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@ try:
         'mock',
         'itsdangerous',
         'pytz',
-        'six',
+        'six>=1.4.1',
         'oauthlib==0.5.0',
         'unidecode',