diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 15:52:06 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 15:52:06 -0300 |
| commit | 86578e5e48fb394297da33f5f93ca07aed9e1af3 (patch) | |
| tree | 70ffb63227d8b93224339267589a08297f3d58fb /common/pkg | |
| parent | 21f58ccc9a29ee82faf0924ea03f39b3c91e43ee (diff) | |
| parent | 6a72835b3fa7267ffcf30ae0e5b5fa948e296390 (diff) | |
Merge branch 'release-0.3.2'
Diffstat (limited to 'common/pkg')
| -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. |