Fixing missing __version__ bug in setup.py

diff --git a/setup.py b/setup.py
index 710c67d..00001d8 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",

diff --git a/src/nepi/__init__.py b/src/nepi/__init__.py
index 1d1359f..c307144 100644 (file)
--- a/src/nepi/__init__.py
+++ b/src/nepi/__init__.py
@@ -21,8 +21,6 @@ import logging
 import os
 import traceback
 
-__version__ = "3.0"
-
 LOGLEVEL = os.environ.get("NEPI_LOGLEVEL", "INFO").upper()
 LOGLEVEL = getattr(logging, LOGLEVEL)
 FORMAT = "%(asctime)s %(name)s %(levelname)-4s %(message)s"

diff --git a/src/nepi/execution/resource.py b/src/nepi/execution/resource.py
index df359f0..fdae0ad 100644 (file)
--- a/src/nepi/execution/resource.py
+++ b/src/nepi/execution/resource.py
@@ -1090,7 +1090,7 @@ class ResourceFactory(object):
         return rclass(ec, guid)
 
 def populate_factory():
-    """Register all the possible RM that exists in the current version of Nepi.
+    """Find and rgister all available RMs
     """
     # Once the factory is populated, don't repopulate
     if not ResourceFactory.resource_types():