summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-26 11:13:58 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-26 11:13:58 -0300
commit525ff6730d45fc0d08db808c577b8753803798fc (patch)
treea46142b663bb50ae4a879bd90e07ddb52e38412f /common
parenta10924b0e2cf19feb673f23ff34707a663001335 (diff)
parent0ac91baec282c1ca32a2f736e971393103cab0c4 (diff)
Merge remote-tracking branch 'kali/hotfix/remove-six-hard-dep' into develop
Diffstat (limited to 'common')
-rw-r--r--common/pkg/requirements-testing.pip4
-rw-r--r--common/pkg/requirements.pip1
2 files changed, 4 insertions, 1 deletions
diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip
index 18040ea1..6ff52ff9 100644
--- a/common/pkg/requirements-testing.pip
+++ b/common/pkg/requirements-testing.pip
@@ -4,3 +4,7 @@ testscenarios
leap.common
leap.soledad.server
leap.soledad.client
+
+# Under quarantine...
+# I've been able to run all tests with six==1.3 -- kali
+# six==1.1.0 # some tests are incompatible with newer versions of six.
diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip
index 8fd57c3f..5787114e 100644
--- a/common/pkg/requirements.pip
+++ b/common/pkg/requirements.pip
@@ -1,6 +1,5 @@
simplejson
u1db
-six==1.1.0 # some tests are incompatible with newer versions of six.
#this is not strictly needed by us, but we need it
#until u1db adds it to its release as a dep.