From ff6141ac35b4e0abd551c4d1f08a1e62ab538ec3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 30 Oct 2017 14:32:14 +0100 Subject: [PATCH] Sync requirements with OpenStack Pike MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit OPNFV F-release is built on top of OpenStack Pike. Functest depends on SNAPS and requires this update. It conforms with the requirement management cleant for E-release [1]. [1] https://wiki.opnfv.org/display/functest/Requirements+management Change-Id: Ifff3db55f8b2f03a91b43fb542328300c7b7b4a6 Signed-off-by: Cédric Ollivier --- requirements.txt | 12 ++++++------ setup.py | 16 +++++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index b0b60c0..c4c6db1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -python-novaclient!=7.0.0,>=6.0.0 # Apache-2.0 -python-neutronclient>=5.1.0 # Apache-2.0 +python-novaclient>=9.0.0 # Apache-2.0 +python-neutronclient>=6.3.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 -python-glanceclient>=2.5.0 # Apache-2.0 +python-glanceclient>=2.8.0 # Apache-2.0 python-heatclient>=1.6.1 # Apache-2.0 -python-cinderclient -ansible>=2.1.0,<2.4 +python-cinderclient>=3.1.0 # Apache-2.0 +ansible<2.4,>=2.1.0 wrapt>=1.7.0 # BSD License scp -cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0 +cryptography!=2.0,>=1.6 # BSD/Apache-2.0 diff --git a/setup.py b/setup.py index f0cf5e8..a1bfd42 100644 --- a/setup.py +++ b/setup.py @@ -7,11 +7,17 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -from setuptools import setup +import setuptools __author__ = 'spisarski' +# 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( - setup_requires=['pbr>=1.9', 'setuptools>=17.1'], - pbr=True, -) +setuptools.setup( + setup_requires=['pbr>=2.0.0'], + pbr=True) -- 2.16.6