diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-16 16:18:59 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-16 16:18:59 -0300 |
| commit | 4c550c558dcb554b3ea1bc0246492e39e8532886 (patch) | |
| tree | 3a18999e62eb18091d002e6c1c7222846a92947b /pkg/requirements.pip | |
| parent | 81715dc47d77934c4f67d2527a56c28f58f0345d (diff) | |
| parent | d52daa106a97562e1cc67c5a2f242f2ef9884508 (diff) | |
Merge branch 'release-0.5.1'
Diffstat (limited to 'pkg/requirements.pip')
| -rw-r--r-- | pkg/requirements.pip | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index be4ea858..70427e63 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -10,16 +10,21 @@ requests>=1.1.0 srp>=1.0.2 pyopenssl python-dateutil -psutil==1.2.1 + +# since gnupg requires exactly 1.2.1, this chokes if we +# don't specify a version. Selecting something lesser than +# 2.0 is equivalent to pick 1.2.1. See #5489 +psutil<2.0 + ipaddr twisted python-daemon # this should not be needed for Windows. keyring zope.proxy -leap.common>=0.3.4 -leap.soledad.client>=0.4.2 -leap.keymanager>=0.3.6 +leap.common>=0.3.7 +leap.soledad.client>=0.5.0 +leap.keymanager>=0.3.8 leap.mail>=0.3.9 # Remove this when u1db fixes its dependency on oauth |