diff options
| author | Kali Kaneko <kali@leap.se> | 2015-02-11 14:01:20 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-11 14:01:20 -0400 |
| commit | 961861044fd2bb50e6e445b05291c03133389d3d (patch) | |
| tree | b17de439fdbfafff239fb2fa60e143523f72c042 /keymanager/pkg | |
| parent | d3a7f97ebc32434cd012f4cd5d334e775e2ead49 (diff) | |
| parent | abf2bde0d74e9f6dbafa7fc088a094d7684f8d5a (diff) | |
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'keymanager/pkg')
| -rw-r--r-- | keymanager/pkg/requirements-testing.pip | 1 | ||||
| -rw-r--r-- | keymanager/pkg/requirements.pip | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keymanager/pkg/requirements-testing.pip b/keymanager/pkg/requirements-testing.pip index f41fdba..14a4820 100644 --- a/keymanager/pkg/requirements-testing.pip +++ b/keymanager/pkg/requirements-testing.pip @@ -1,2 +1,3 @@ mock leap.soledad.client +setuptools-trial diff --git a/keymanager/pkg/requirements.pip b/keymanager/pkg/requirements.pip index f3cdae9..11c4229 100644 --- a/keymanager/pkg/requirements.pip +++ b/keymanager/pkg/requirements.pip @@ -3,5 +3,5 @@ simplejson requests # if we bump the gnupg version, bump also the sanity check # in keymanager.__init__ -gnupg>=1.2.3 -enum +gnupg>=1.4.0 +enum34 |