diff options
| author | drebs <drebs@leap.se> | 2015-06-04 11:21:40 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-06-04 11:21:40 -0300 |
| commit | 293c71080e9a21115d248e46d1a706c53cc8ee37 (patch) | |
| tree | 3353672f1f770ef5f5c87ea7e3e27debe737a50b /common/pkg | |
| parent | fa7708e256ba56cd1e9913993d68611b4ae95824 (diff) | |
| parent | 9fb1c47ca7da06d6feef6846b812aec28128ed78 (diff) | |
Merge tag '0.7.0'
Tag version 0.7.0.
Conflicts:
CHANGELOG
client/src/leap/soledad/client/__init__.py
client/src/leap/soledad/client/sqlcipher.py
client/src/leap/soledad/client/target.py
server/pkg/soledad-server
Diffstat (limited to 'common/pkg')
| -rw-r--r-- | common/pkg/requirements-testing.pip | 1 | ||||
| -rw-r--r-- | common/pkg/requirements.pip | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip index 9302450c..c72c9fc4 100644 --- a/common/pkg/requirements-testing.pip +++ b/common/pkg/requirements-testing.pip @@ -3,3 +3,4 @@ testscenarios leap.common leap.soledad.server leap.soledad.client +setuptools-trial diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip index 5787114e..005d6884 100644 --- a/common/pkg/requirements.pip +++ b/common/pkg/requirements.pip @@ -1,7 +1,10 @@ simplejson u1db -#this is not strictly needed by us, but we need it -#until u1db adds it to its release as a dep. -oauth +# leap deps -- bump me! +leap.common>=0.7.0 +# XXX -- fix me! +# oauth is not strictly needed by us, but we need it until u1db adds it to its +# release as a dep. +oauth |