X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=setup.py;fp=setup.py;h=a9744ee0b8c1257b711b6cd1e3ac2349eee1dfde;hp=6dd7d31b6674ba194fe8846eb29734c934e03e36;hb=e637272100e8e03884188cb2118b21158e739bb0;hpb=328ee7b92f4e23570d8a33ad9244413ae3aee6bf

diff --git a/setup.py b/setup.py
index 6dd7d31..a9744ee 100644
--- a/setup.py
+++ b/setup.py
@@ -2,46 +2,44 @@
 
 from distutils.core import setup
 
-packages=[	'monitor', 
-			'monitor.database', 
-			'monitor.Rpyc', 
-			'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=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',
-
-	]
+          '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='2.0',
+      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)