3 files changed, 50 insertions, 18 deletions
diff --git a/modules/setup.cfg b/modules/setup.cfg
new file mode 100644
index 000000000..dbe5a3709
--- /dev/null
+++ b/modules/setup.cfg
@@ -0,0 +1,7 @@
+[metadata]
+name = opnfv
+version = 5
+home-page = https://wiki.opnfv.org/display/releng/Releng
+
+[files]
+packages = opnfv
diff --git a/modules/setup.py b/modules/setup.py
index 0dd635fbe..a1e9b3bb2 100644
--- a/modules/setup.py
+++ b/modules/setup.py
@@ -1,25 +1,22 @@
-##############################################################################
+#!/usr/bin/env python
+
+# Copyright (c) 2017 Orange and others.
+#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
 
-from setuptools import setup, find_packages
+import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
 
-setup(
-    name="opnfv",
-    version="danube",
-    packages=find_packages(),
-    include_package_data=True,
-    package_data={
-    },
-    url="https://www.opnfv.org",
-    install_requires=["paramiko>=2.0",
-                      "mock>=2.0",
-                      "requests!=2.12.2,>=2.10.0"],
-    test_requires=["nose",
-                   "coverage>=4.0"]
-)
+setuptools.setup(
+    setup_requires=['pbr>=1.8'],
+    pbr=True)
diff --git a/modules/tox.ini b/modules/tox.ini
new file mode 100644
index 000000000..835cb6ba2
--- /dev/null
+++ b/modules/tox.ini
@@ -0,0 +1,28 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27
+skipsdist = True
+
+[testenv]
+usedevelop = True
+setenv=
+  HOME = {envtmpdir}
+  PYTHONPATH = {toxinidir}
+
+[testenv:modules]
+deps=
+  -rrequirements.txt
+  -rtest-requirements.txt
+commands =
+  nosetests \
+  --with-xunit \
+  --xunit-file=nosetests.xml \
+  --cover-package=opnfv \
+  --with-coverage \
+  --cover-xml \
+  --cover-html \
+  tests/unit