From 018e2929a04fbdf9f27df3bf5db48b807b7c93d4 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 9 Sep 2017 12:19:52 +0200
Subject: Leverage on pbr (Python Build Reasonableness)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pbr can inject requirements into the install_requires, tests_require
and/or dependency_links arguments to setup.

It finishes cleaning the requirements management [1] for all OPNFV
projects integrated by Functest.

[1] https://wiki.opnfv.org/display/functest/Requirements+management

Change-Id: I30b76db8dcaba809e0b314fbd06ae04d24c8baca
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 modules/setup.cfg |  7 +++++++
 modules/setup.py  | 33 +++++++++++++++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 modules/setup.cfg

(limited to 'modules')

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)
-- 
cgit 1.2.3-korg