From be6ec06f040e1c710a70d624eeb44ee4a65add9b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 24 Jun 2017 10:36:17 +0200 Subject: Add requirements in sfc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It now leverages on pbr to scan requirements.txt and inject them into the install_requires. Change-Id: If51827f6f8839af930c862d846b76b85a778c860 Signed-off-by: Cédric Ollivier --- requirements.txt | 9 +++++++++ setup.cfg | 7 +++++++ setup.py | 28 +++++++++++++++------------- 3 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 requirements.txt create mode 100644 setup.cfg diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..94f59bd6 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,9 @@ +pbr>=1.8 # Apache-2.0 +paramiko>=2.0 # LGPLv2.1+ +python-glanceclient>=2.5.0 # Apache-2.0 +requests!=2.12.2,>=2.10.0 # Apache-2.0 +xmltodict>=0.10.1 # MIT +python-keystoneclient>=3.8.0 # Apache-2.0 +python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0 +PyYAML>=3.10.0 # MIT +opnfv diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..edeeb5de --- /dev/null +++ b/setup.cfg @@ -0,0 +1,7 @@ +[metadata] +name = sfc +version = 5 +home-page = https://wiki.opnfv.org/display/sfc/Service+Function+Chaining+Home + +[files] +packages = sfc diff --git a/setup.py b/setup.py index 07de7888..a1e9b3bb 100644 --- a/setup.py +++ b/setup.py @@ -1,20 +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="sfc", - 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) -- cgit 1.2.3-korg