diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-23 17:40:44 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-26 21:11:22 +0200 |
| commit | 79f95564ee8d9c080a1096fcc4ab1829c04a4ebf (patch) | |
| tree | b7251ac902e81ddc140b5cece2358b74f7cb7c85 | |
| parent | 9d623a18f80218ffb719903f6636545705c039f8 (diff) | |
Remove the hard-dep on six
It looks like it is no longer needed, but leaving it commented
until we do some more tests.
| -rw-r--r-- | common/pkg/requirements-testing.pip | 4 | ||||
| -rw-r--r-- | common/pkg/requirements.pip | 1 |
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. |