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 | 8d8d5f2a3d9dbefcf98a5e3d7245a5f13360a88e (patch) | |
| tree | 4e91d829a7185be9cb127592747eb72866d47f77 /pkg | |
| parent | c794991d65d987b59014d067e730976684307775 (diff) | |
| parent | 82d027b1f471517213bdcdc773dc8eea677fe330 (diff) | |
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements-testing.pip | 1 | ||||
| -rw-r--r-- | pkg/requirements.pip | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip index f41fdba..14a4820 100644 --- a/pkg/requirements-testing.pip +++ b/pkg/requirements-testing.pip @@ -1,2 +1,3 @@ mock leap.soledad.client +setuptools-trial diff --git a/pkg/requirements.pip b/pkg/requirements.pip index f3cdae9..11c4229 100644 --- a/pkg/requirements.pip +++ b/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 |