X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=setup.py;h=ab111bf8b297c19b8e8faadcb25f6f73a8a41bdf;hp=f7c701151bd407935474f55cddd5d256b2eb6a26;hb=9ba5c613360d4d8e4ecae4da383819464a10d5fd;hpb=bb27511cfa75af5e9c6b7874800eb2b47fd27706

diff --git a/setup.py b/setup.py
index f7c70115..ab111bf8 100755
--- a/setup.py
+++ b/setup.py
@@ -16,8 +16,8 @@ import shutil
 from distutils.core import setup
 
 # check for the correct version of python
-major,minor = sys.version_info [0:2]
-if (major,minor) != (2,7):
+major, minor = sys.version_info [0:2]
+if (major, minor) != (2, 7):
     print ("Sorry, the SFA package is currently available only with python-2.7")
     exit(1)
 
@@ -61,14 +61,14 @@ packages = [
     'sfa/openstack',
     'sfa/federica',
     'sfa/iotlab',
-    'sfa/cortexlab',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
     ]
 
 initscripts = [ 'sfa' ]
-if not os.path.isfile('/etc/redhat-release'): initscripts.append('functions.sfa')
+if not os.path.isfile('/etc/redhat-release'):
+    initscripts.append('functions.sfa')
 
 data_files = [ ('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
@@ -103,25 +103,26 @@ for d in processor_subdirs:
 
 if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     python_path = sys.path
-    site_packages_path = [ os.path.join(p,'sfa') for p in python_path if p.endswith('site-packages')]
-    site_packages_path += [ os.path.join(p,'sfatables') for p in python_path if p.endswith('site-packages')]
+    site_packages_path = [ os.path.join(p, 'sfa') for p in python_path if p.endswith('site-packages')]
+    site_packages_path += [ os.path.join(p, 'sfatables') for p in python_path if p.endswith('site-packages')]
     remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
     remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in scripts ]
     remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
 
     # remove files
-    def feedback (file, msg): print ("removing", file, "...",msg)
+    def feedback (file, msg):
+        print ("removing", file, "...", msg)
     for filepath in remove_files:
         try:
             os.remove(filepath)
-            feedback(filepath,"success")
+            feedback(filepath, "success")
         except: 
-            feedback(filepath,"failed")
+            feedback(filepath, "failed")
     # remove directories
     for directory in remove_dirs:
         try:
             shutil.rmtree(directory)
-            feedback (directory,"success")
+            feedback (directory, "success")
         except: 
             feedback (directory, "failed")
 else:
@@ -137,18 +138,19 @@ else:
     except:
         long_description = "Unable to read index.html"
 
-    setup(name='sfa',
-          packages = packages,
-          data_files = data_files,
-          version=version_tag,
-          keywords = ['federation','testbeds','SFA','SfaWrap'],
-          url="http://svn.planet-lab.org/wiki/SFATutorial",
-          author="Thierry Parmentelat, Tony Mack, Scott Baker",
-          author_email="thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
-          download_url = "http://build.onelab.eu/sfa/{v}/sfa-{v}.tar.gz".format(v=version_tag),
-          description="SFA Wrapper with drivers for PlanetLab and IotLab and others",
-          license = license,
-          long_description = long_description,
-          scripts = scripts,
+    setup(
+        name             = 'sfa',
+        packages         = packages,
+        data_files       = data_files,
+        version          = version_tag,
+        keywords         = ['federation', 'testbeds', 'SFA', 'SfaWrap'],
+        url              = "http://svn.planet-lab.org/wiki/SFATutorial",
+        author           = "Thierry Parmentelat, Tony Mack, Scott Baker",
+        author_email     = "thierry.parmentelat@inria.fr, tmack@princeton.cs.edu, smbaker@gmail.com",
+        download_url     = "http://build.onelab.eu/sfa/{v}/sfa-{v}.tar.gz".format(v=version_tag),
+        description      = "SFA Wrapper with drivers for PlanetLab and IotLab and others",
+        license          = license,
+        long_description = long_description,
+        scripts          = scripts,
 )