aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2014-03-20 23:25:25 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2014-03-20 23:25:25 -0500
commitc07bb3123c953d3cb585f16ca73241c5891730cd (patch)
tree90b53c35741e93b5d54ae75b1b48d187204b25e7
parent36990574cf2cad572b1dd52653666605306022da (diff)
downloadmediagoblin-c07bb3123c953d3cb585f16ca73241c5891730cd.tar.lz
mediagoblin-c07bb3123c953d3cb585f16ca73241c5891730cd.tar.xz
mediagoblin-c07bb3123c953d3cb585f16ca73241c5891730cd.zip
Fix version conflicts we were hitting with six
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index a3cc055c..6310a1bc 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@ try:
'mock',
'itsdangerous',
'pytz',
- 'six',
+ 'six>=1.4.1',
'oauthlib==0.5.0',
'unidecode',