Merge remote-tracking branch 'kali/bug/fix-imports' into develop
authorTomas Touceda <chiiph@leap.se>
Thu, 11 Apr 2013 12:20:52 +0000 (09:20 -0300)
committerTomas Touceda <chiiph@leap.se>
Thu, 11 Apr 2013 12:20:52 +0000 (09:20 -0300)
Conflicts:
pkg/requirements.pip
setup.py

1  2 
pkg/requirements.pip
setup.py

@@@ -1,4 -1,2 +1,6 @@@
 +jsonschema<=0.8
 +pyxdg
 +protobuf
 +protobuf.socketrpc
+ pyopenssl
+ python-dateutil
diff --cc setup.py
+++ b/setup.py
@@@ -19,23 -19,11 +19,25 @@@ setup file for leap.commo
  """
  from setuptools import setup, find_packages
  
 +# XXX parse pkg/requirements.pip
  requirements = [
 +    "jsonschema",
 +    "pyxdg",
 +    'protobuf',
 +    'protobuf.socketrpc',
+     "PyOpenSSL",
+     "python-dateutil",
  ]
  
 +
 +dependency_links = [
 +    # XXX this link is only for py2.6???
 +    # we need to get this packaged or included
 +    #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc",
 +    "https://code.google.com/p/protobuf-socket-rpc/downloads/detail?name=protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc",
 +]
 +
 +
  # XXX add classifiers, docs
  
  setup(