summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@leap.se>2013-04-11 09:20:52 -0300
committerTomas Touceda <chiiph@leap.se>2013-04-11 09:20:52 -0300
commit63f0d92a715b8d84536a449dc1e6b2b5eb9a7cb2 (patch)
tree6a8e80ffcb11f2ab2a27d09f49033fe92dc731b7
parent1693669bacac1febcc81ad782028e216804d6f35 (diff)
parent8b83009219f468b93acd7ec7a54cbd12fb3bc9fb (diff)
Merge remote-tracking branch 'kali/bug/fix-imports' into develop
Conflicts: pkg/requirements.pip setup.py
-rw-r--r--changes/bug_fix-imports1
-rw-r--r--pkg/requirements.pip2
-rw-r--r--setup.py2
3 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug_fix-imports b/changes/bug_fix-imports
new file mode 100644
index 0000000..509f2f4
--- /dev/null
+++ b/changes/bug_fix-imports
@@ -0,0 +1 @@
+ o Fix missing imports
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index ca21223..85e5aef 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -2,3 +2,5 @@ jsonschema<=0.8
pyxdg
protobuf
protobuf.socketrpc
+pyopenssl
+python-dateutil
diff --git a/setup.py b/setup.py
index 31fc8d3..c0bd98f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,8 @@ requirements = [
"pyxdg",
'protobuf',
'protobuf.socketrpc',
+ "PyOpenSSL",
+ "python-dateutil",
]