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 /client/pkg/requirements.pip | |
| 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 'client/pkg/requirements.pip')
| -rw-r--r-- | client/pkg/requirements.pip | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index ae8d2dac..9fffdbe3 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -1,25 +1,17 @@ -pysqlcipher +pysqlcipher>2.6.3 simplejson u1db scrypt pycryptopp cchardet -taskthread zope.proxy +twisted -# -# leap deps -# +# leap deps -- bump me! +leap.common>=0.4 +leap.soledad.common>=0.6.5 -leap.soledad.common>=0.3.8 - -# -# XXX things to fix yet: -# - -# this is not strictly needed by us, but we need it -# until u1db adds it to its release as a dep. +# 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 - -# pysqlite should not be a dep, see #2945 -pysqlite |