summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-02-09 22:27:22 -0200
committerdrebs <drebs@leap.se>2013-02-09 22:27:22 -0200
commit46a3373295a683db9b66c233b07a7a948b8147bc (patch)
tree410a47871bfd8654ddabbb53f3c29a89c1550e71 /pkg
parente726f3df7c7efbe4069846468ffdbed6829ccfc4 (diff)
parentb376948ccd59aa02022123102eaae359a536e4e6 (diff)
Merge branch 'develop' into feature/soledad-api
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/postmkvenv.sh4
-rw-r--r--pkg/requirements.pip8
-rw-r--r--pkg/test-requirements.pip1
3 files changed, 11 insertions, 2 deletions
diff --git a/pkg/postmkvenv.sh b/pkg/postmkvenv.sh
index 593b11da..a503052a 100755
--- a/pkg/postmkvenv.sh
+++ b/pkg/postmkvenv.sh
@@ -34,5 +34,7 @@ fi
for LIB in ${LIBS[@]}
do
- ln -s $LIB_SYSTEM_PATH/$LIB $LIB_VIRTUALENV_PATH/$LIB
+ if [[ ! -e $LIB_VIRTUALENV_PATH/$LIB ]]; then
+ ln -s $LIB_SYSTEM_PATH/$LIB $LIB_VIRTUALENV_PATH/$LIB
+ fi
done
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 9b521a95..cbfbe8fb 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -12,8 +12,14 @@ pycrypto
keyring
python-dateutil
sh
+pyxdg
+
pygeoip # optional
-ping # to be deprecated
+
+# email
+
+zope.interface
+twisted>=12.3.0
# soledad deps -- will move to its own repo soon
python-gnupg
diff --git a/pkg/test-requirements.pip b/pkg/test-requirements.pip
index edd53b16..d60439ea 100644
--- a/pkg/test-requirements.pip
+++ b/pkg/test-requirements.pip
@@ -6,6 +6,7 @@ nose
pep8==1.1
sphinx>=1.1.2
nose-exclude
+tox
# for soledad * to be splitted *
nose2