X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=c8259f92d3ef0ee6a3d9ebdd356d0563fa7d006a;hb=0a4c02a2bf0bf21726a6decf3e7f3f01ed32d89a;hp=33f04340cda7f6748191404f1d0ae51ec671562b;hpb=fae309c53ba7e65f1b51047d8c8fbb7a10477713;p=sfa.git

diff --git a/setup.py b/setup.py
index 33f04340..c8259f92 100755
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,15 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+
+from __future__ import print_function
 
 """
 Installation script for the sfa module
 """
 
+# as fas as pushing onto pypi, I have been using this page
+# http://peterdowns.com/posts/first-time-with-pypi.html
+# for setting up the whole business
+
 import sys, os, os.path
 from glob import glob
 import shutil
@@ -48,6 +54,7 @@ packages = [
     'sfa/openstack',
     'sfa/federica',
     'sfa/iotlab',
+    'sfa/cortexlab',
     'sfatables',
     'sfatables/commands',
     'sfatables/processors',
@@ -96,27 +103,40 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     remove_files = remove_bins + [ "/etc/init.d/%s"%x for x in initscripts ]
 
     # remove files
+    def feedback (file, msg): print ("removing", file, "...",msg)
     for filepath in remove_files:
-        print "removing", filepath, "...",
         try:
             os.remove(filepath)
-            print "success"
-        except: print "failed"
+            feedback(filepath,"success")
+        except: 
+            feedback(filepath,"failed")
     # remove directories
     for directory in remove_dirs:
-        print "removing", directory, "...",
         try:
             shutil.rmtree(directory)
-            print "success"
-        except: print "failed"
+            feedback (directory,"success")
+        except: 
+            feedback (directory, "failed")
 else:
     # avoid repeating what's in the specfile already
+    with open("LICENSE.txt") as l:
+        license = l.read()
+    long_description = "Could not open README.html"
+    with open("readme.html") as r:
+        long_description = r.read()
+
     setup(name='sfa',
           packages = packages,
           data_files = data_files,
-          scripts = scripts,
+          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",
-          version=version_tag)
+          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,
+)