X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=setup.py;h=d3dbde99d41779c4a2b95acdd3ddc3c9e931f7b4;hp=f9cb03ab640fa206a120f7fe2a85b6dc95de0c90;hb=HEAD;hpb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad

diff --git a/setup.py b/setup.py
index f9cb03a..d3dbde9 100644
--- a/setup.py
+++ b/setup.py
@@ -2,45 +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='2.0',
+      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=['pcucontrol', 
-		'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',
+      packages=packages)
 
-	]
-
-# TODO: add data dir for intelamt and hpilo stuff
-print packages
-setup(name='PCUControlModule',
-      version='2.0',
-      description='PCU Control Module',
-      author='Stephen Soltesz',
-      author_email='soltesz@cs.princeton.edu',
-      url='http://www.planet-lab.org',
-	  packages=packages,
-)
+#packages=['pcucontrol', 
+#          '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=pcucontrol_version,
+#      description='PCU Control Module',
+#      author='Stephen Soltesz',
+#      author_email='soltesz@cs.princeton.edu',
+#      url='http://www.planet-lab.org',
+#      packages=packages)