Bump six dependency (fixes bpython#494)

sebastinas · sebastinas · commit b1d1da768c44 · 2015-02-28T12:59:51.000+01:00
from six.moves.X import Y only works with six 1.5 and newer. Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at> (cherry picked from commit 934c5b6)
diff --git a/.travis.install.sh b/.travis.install.sh
@@ -10,7 +10,7 @@ if [[ $RUN == nosetests ]]; then
     pip install requests
     pip install 'curtsies >=0.1.17,<0.2.0'
     pip install greenlet
-    pip install 'six >=1.4'
+    pip install 'six >=1.5'
     # filewatch specific dependencies
     pip install watchdog
     # jedi specific dependencies
diff --git a/setup.py b/setup.py
@@ -212,7 +212,7 @@ def initialize_options(self):
     'requests',
     'curtsies >=0.1.18, <0.2.0',
     'greenlet',
-    'six >=1.4'
+    'six >=1.5'
 ]
 
 extras_require = {

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ def initialize_options(self):`
`212`	`212`	`'requests',`
`213`	`213`	`'curtsies >=0.1.18, <0.2.0',`
`214`	`214`	`'greenlet',`
`215`		`- 'six >=1.4'`
	`215`	`+ 'six >=1.5'`
`216`	`216`	`]`
`217`	`217`
`218`	`218`	`extras_require = {`