remove setup.cfg and put everythin in setup.py

also the field names need to be description and long_description - and not summary and description that I had read before; this I believe is for a more recent version of setup.py (or older, go figure)

diff --git a/Makefile b/Makefile
index bbdb831..40394d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ SCMURL=git://git.onelab.eu/sfa.git
 TARBALL_HOST=root@build.onelab.eu
 TARBALL_TOPDIR=/build/sfa
 # I have an alternate pypitest entry defined in my .pypirc
-PYPI_ARGS= -r pypi
+PYPI_TARGET=pypi
 
 python: version
 
@@ -156,8 +156,15 @@ index.zip: README.md
        python readme.py
 
 # I need to run this on my mac as my pypi
-pypi: version
-       setup.py sdist upload $(PYPI_ARGS)
+# run git pull first as this often comes afet a module-tag
+# we need to re-run make so the version is right
+git_pypi: 
+       git pull
+       $(MAKE) pypi
+
+# run this only once the sources are in on the right tag
+pypi:
+       setup.py sdist upload -r $(PYPI_TARGET)
        ssh $(TARBALL_HOST) mkdir -p $(TARBALL_TOPDIR)/$(VERSIONTAG)
        rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(TARBALL_HOST):$(TARBALL_TOPDIR)/$(VERSIONTAG)
 

diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644 (file)
index 524b905..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[metadata]
-summary = An SFA Wrapper together with drivers for PlanetLab and IotLab and others
-description-file = README.md
-license = LICENSE.txt

diff --git a/setup.py b/setup.py
index 4bd4583..c8259f9 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+
+from __future__ import print_function
 
 """
 Installation script for the sfa module
@@ -101,21 +103,28 @@ 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,
@@ -125,6 +134,9 @@ else:
           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,
 )