diff options
| author | kali <kali@leap.se> | 2013-01-30 06:52:59 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-30 06:52:59 +0900 |
| commit | 570f84756b3d1f689a172a3ff0c55abf6a60b9dd (patch) | |
| tree | 0f262acacf35743664c6408edbafe6ba6f119d14 /pkg/requirements.pip | |
| parent | e60abdcb796ad9e2c44e9b37d3a68e7f159c035c (diff) | |
| parent | 10a2303fe2d21999bce56940daecb78576f5b741 (diff) | |
Merge branch 'pre-release-0.2.0' into release-0.2.0
This merge contains today's state of develop branch,
minus soledad and email components.
Diffstat (limited to 'pkg/requirements.pip')
| -rw-r--r-- | pkg/requirements.pip | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index e5338744..89b0ad3b 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,13 +1,17 @@ # in order of addition to the project. -# do not change it, we will freeze the requirements before tagging a release. +# do not change the ordering. argparse # only for python 2.6 -requests -ping +requests<1.0.0 psutil netifaces -python-gnutls==1.1.9 # see https://bugs.launchpad.net/ubuntu/+source/python-gnutls/+bug/1027129 +pyopenssl jsonschema -srp +srp>=1.0.2 pycrypto keyring +python-dateutil +sh +pyxdg + +pygeoip # optional |