X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=089c2512db60d46ba26c58d40b334cf76f014fab;hb=73cfb31233ab2d1e1e86ab187b2bd1aa0f33ce7e;hp=235743d58b07d4a8375ad70fe880096679be6563;hpb=3fe2e6f7812888dc1366915545dd2243ff6fb1bb;p=nepi.git

diff --git a/setup.py b/setup.py
index 235743d5..089c2512 100755
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,27 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-import sys
 
+# python2 or python3 ?
+import sys
 PY2 = sys.version_info[0] == 2
 
-with open('VERSION') as f:
-    version_tag = f.read().strip()
+# read version
+# while cleaning up version.py might just not be there
+#try:
+#    from nepi.util.version import version_tag
+#except:
+#    version_tag = 'cleaningup'
+from nepi.util.version import version_tag
+
+# read licence info
 with open("COPYING") as f:
     license = f.read()
-with open("README") as f:
+with open("README.md") as f:
     long_description = f.read()
 
-data_files = [ ('/etc/nepi', [ 'VERSION', 'COPYING', 'README' ] ) ]
+# we'd probably would be better off with this some place else
+data_files = [ ('/etc/nepi', [ 'COPYING', 'README.md' ] ) ]
 
 ### requirements - used by pip install
 required_modules = [ ]
@@ -42,7 +51,6 @@ setup(
     url              = "http://nepi.inria.fr/",
     platforms        = "Linux, OSX",
     data_files       = data_files,
-    package_dir      = {"": "src"},
     packages         = [
         "nepi",
         "nepi.execution",