X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=56858865d0c2cb722d95f8ec360976cd340d5778;hb=cac9be0360a92cf3f6e6192c9c31fce10db9ce91;hp=dce8a6bbda023553c31f6bd63028a85362d7ed13;hpb=edd8c3fdc0b2239c21552f9b678ff7795f3309c1;p=nepi.git

diff --git a/setup.py b/setup.py
index dce8a6bb..56858865 100755
--- a/setup.py
+++ b/setup.py
@@ -1,44 +1,41 @@
 #!/usr/bin/env python
-# vim: set fileencoding=utf-8
+
 from distutils.core import setup
 import sys
 
-# CHECK dependencies
-# Python >= 2.6
-if sys.hexversion < 0x2060000:
-    raise RuntimeError("Python version >= 2.6 required")
-# ipaddr >= 2.1.7
-try:
-    import ipaddr
-    l = ipaddr.__version__.split('.')
-    l.reverse()
-    if sum( int(l[i])*pow(10,i) for i in xrange(len(l))) < 217:
-        raise RuntimeError("ipaddr >= 2.1.7 is required")
-except:
-    raise RuntimeError("ipaddr >= 2.1.7 is required. You can download from http://ipaddr-py.googlecode.com/files/ipaddr-2.1.7.tar.gz")
-
 setup(
         name        = "nepi",
-        version     = "0.2",
-        description = "High-level abstraction for running network experiments",
-        author      = "Mathieu Lacage, Alina Quereilhac, Martín Ferrari and Claudio Freire",
-        url         = "http://yans.pl.sophia.inria.fr/code/hgwebdir.cgi/nepi/",
-        license     = "GPLv2",
-        platforms   = "Linux",
+        version     = "nepi-3-dev",
+        description = "Network Experiment Management Framework",
+        author      = "Alina Quereilhac, Julien Tribino, Lucia Guevgeozian",
+        url         = "http://nepi.inria.fr",
+        license     = "GPLv3",
+        platforms   = "Linux, OSX",
         packages    = [
             "nepi",
-            "nepi.testbeds",
-            "nepi.testbeds.netns",
-            "nepi.testbeds.ns3",
-            "nepi.testbeds.planetlab",
-            "nepi.core",
-            "nepi.util.parser",
-            "nepi.util.settools",
-            "nepi.util.graphtools",
-            "nepi.util" ],
+            "nepi.execution",
+            "nepi.resources",
+            "nepi.resources.all",
+            "nepi.resources.linux",
+            "nepi.resources.linux.ccn",
+            "nepi.resources.linux.ns3",
+            "nepi.resources.linux.ns3.ccn",
+            "nepi.resources.netns",
+            "nepi.resources.ns3",
+            "nepi.resources.ns3.classes",
+            "nepi.resources.omf",
+            "nepi.resources.planetlab",
+            "nepi.resources.planetlab.openvswitch",
+            "nepi.util",
+            "nepi.util.parsers",
+            "nepi.data",
+            "nepi.data.processing",
+            "nepi.data.processing.ccn",
+            "nepi.data.processing.ping"],
         package_dir = {"": "src"},
-        package_data = {"nepi.testbeds.planetlab" : [
-                                "scripts/*.py", "scripts/*.c", "scripts/*.patch", 
-                        ],
-                        "nepi.util" : ["*.tpl"] },
+        package_data = {
+            "nepi.resources.planetlab" : [ "scripts/*.py" ],
+            "nepi.resources.linux" : [ "scripts/*.py" ],
+            "nepi.resources.linux.ns3" : [ "dependencies/*.tar.gz" ]
+            }
     )