From 0ac91baec282c1ca32a2f736e971393103cab0c4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 23 Aug 2013 17:40:44 +0200 Subject: Remove the hard-dep on six It looks like it is no longer needed, but leaving it commented until we do some more tests. --- common/pkg/requirements-testing.pip | 4 ++++ common/pkg/requirements.pip | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3