Merging NETNS platform

[nepi.git] / setup.py

diff --git a/setup.py b/setup.py
index fdb8017..01aba6d 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env python
-from nepi import __version__
 
 from distutils.core import setup
 import sys
 
 setup(
         name        = "nepi",
-        version     = __version__,
+        version     = "nepi-3-dev",
         description = "Network Experiment Management Framework",
         author      = "Alina Quereilhac, Julien Tribino, Lucia Guevgeozian",
         url         = "http://nepi.inria.fr",
@@ -14,7 +13,6 @@ setup(
         platforms   = "Linux, OSX",
         packages    = [
             "nepi",
-            "nepi.design",
             "nepi.execution",
             "nepi.resources",
             "nepi.resources.all",
@@ -29,7 +27,12 @@ setup(
             "nepi.resources.omf",
             "nepi.resources.planetlab",
             "nepi.resources.planetlab.openvswitch",
-            "nepi.util"],
+            "nepi.util",
+            "nepi.util.parsers",
+            "nepi.data",
+            "nepi.data.processing",
+            "nepi.data.processing.ccn",
+            "nepi.data.processing.ping"],
         package_dir = {"": "src"},
         package_data = {
             "nepi.resources.planetlab" : [ "scripts/*.py" ],