summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-06-26 06:51:55 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-06-26 06:53:00 +0200
commit4a6bb979b45c3b7f00f9dcc9519f439b3d405189 (patch)
treeb42a0ae80d621fb6b5c2149a15ba19708277521e
parentde80ee56c458b127be3497f3882bc1c962f42dfe (diff)
Add requirements in sdnvpn
It now leverages on pbr to scan requirements.txt and inject them into the install_requires. Change-Id: Iae1517ae0bfd3575e9d16de4a2ca42e114d956fb Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--requirements.txt4
-rw-r--r--setup.cfg7
-rw-r--r--setup.py26
3 files changed, 26 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..5543064
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,4 @@
+pbr>=1.8 # Apache-2.0
+requests!=2.12.2,>=2.10.0 # Apache-2.0
+opnfv
+PyYAML>=3.10.0 # MIT
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..e26266c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,7 @@
+[metadata]
+name = sdnvpn
+version = 5
+home-page = https://wiki.opnfv.org/display/sdnvpn/SDNVPN+project+main+page
+
+[files]
+packages = sdnvpn
diff --git a/setup.py b/setup.py
index a637260..a1e9b3b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,18 +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="sdnvpn",
- version="danube",
- packages=find_packages(),
- include_package_data=True,
- package_data={},
- url="https://www.opnfv.org")
+setuptools.setup(
+ setup_requires=['pbr>=1.8'],
+ pbr=True)