X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=a9744ee0b8c1257b711b6cd1e3ac2349eee1dfde;hb=dc1c378d0f44970c6a1382064da7089494572398;hp=19532fa5f72f79eca0070597e9c3289887bedc09;hpb=3f501b69f366b8b6c62d35d6aea4ebf5fa0f1192;p=monitor.git

diff --git a/setup.py b/setup.py
index 19532fa..a9744ee 100644
--- a/setup.py
+++ b/setup.py
@@ -2,40 +2,44 @@
 
 from distutils.core import setup
 
-packages=['monitor', 'monitor.database', 'monitor.database.zabbixapi', 
-		'monitor.database.info', 'monitor.sources', 
-		'monitor.util', 'monitor.wrapper' ]
+from monitor.monitor_version import *
+
+packages=['monitor', 
+          'monitor.database', 
+          'monitor.Rpyc', 
+          'monitor.database.zabbixapi', 
+          'monitor.database.info', 
+          'monitor.sources', 
+          'monitor.util', 
+          'monitor.wrapper']
 
 print packages
 setup(name='MonitorModule',
-      version='1.1',
+      version=monitor_version,
       description='Monitor Utility Module',
       author='Stephen Soltesz',
       author_email='soltesz@cs.princeton.edu',
       url='http://www.planet-lab.org',
-	  packages=packages,
-)
+      packages=packages)
 
 packages=['pcucontrol', 
-		'pcucontrol.transports',
-		'pcucontrol.transports.ssh',
-		'pcucontrol.transports.pyssh',
-		'pcucontrol.models',
-		'pcucontrol.models.hpilo',
-		'pcucontrol.models.hpilo.iloxml',
-		'pcucontrol.models.intelamt',
-		'pcucontrol.models.intelamt',
-
-	]
+          'pcucontrol.util',
+          'pcucontrol.transports',
+          'pcucontrol.transports.ssh',
+          'pcucontrol.transports.pyssh',
+          'pcucontrol.models',
+          'pcucontrol.models.hpilo',
+          'pcucontrol.models.hpilo.iloxml',
+          'pcucontrol.models.intelamt',
+          'pcucontrol.models.intelamt']
 
 # TODO: add data dir for intelamt and hpilo stuff
 print packages
 setup(name='PCUControlModule',
-      version='1.1',
+      version=pcucontrol_version,
       description='PCU Control Module',
       author='Stephen Soltesz',
       author_email='soltesz@cs.princeton.edu',
       url='http://www.planet-lab.org',
-	  packages=packages,
-)
+      packages=packages)