From 8229af83ef3c740ce123e32a20e2f39b9b04064b Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Wed, 15 Nov 2017 16:54:00 +0100 Subject: [PATCH] Update from global requirements Change-Id: I5ae6513db8b4227501c7713ed1cc8d941413bccd --- requirements.txt | 18 +++++++++--------- setup.cfg | 16 ++++++++-------- setup.py | 13 ++++++++++--- test-requirements.txt | 4 ++-- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3687c2c4..e35bf83b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,14 +3,14 @@ # process, which may cause wedges in the gate later. requests>=2.14.2 # Apache-2.0 -oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0 -oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0 -oslo.utils>=3.20.0 # Apache-2.0 +oslo.concurrency>=3.20.0 # Apache-2.0 +oslo.config>=4.6.0 # Apache-2.0 +oslo.i18n>=3.15.3 # Apache-2.0 +oslo.utils>=3.31.0 # Apache-2.0 oslo.vmware>=2.17.0 # Apache-2.0 -PyYAML>=3.10.0 # MIT -httplib2>=0.7.5 # MIT -netaddr!=0.7.16,>=0.7.13 # BSD +PyYAML>=3.10 # MIT +httplib2>=0.9.1 # MIT +netaddr>=0.7.18 # BSD ntplib>=0.3.2,<0.4 psutil>=3.2.2 # BSD pymongo!=3.1,>=3.0.2 # Apache-2.0 @@ -22,8 +22,8 @@ six>=1.9.0 # MIT supervisor>=3.1.3,<3.4 stevedore>=1.20.0 # Apache-2.0 tornado>=4.3 -futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD +futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD # NOTE(sdague): before allowing in >= 0.21 please be sure # https://github.com/eventlet/eventlet/issues/401 is resolved eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT -keystoneauth1>=3.1.0 # Apache-2.0 +keystoneauth1>=3.2.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index d3b4ab6d..17ff5a74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,18 +44,18 @@ monasca_agent.collector.virt = # for details see #PEP0426 [extras] influxdb = - toml + toml influxdb_relay = - toml + toml kafka_plugin = - monasca-common >= 1.4.0 + monasca-common>=1.4.0 # Apache-2.0 libvirt = - libvirt-python>=1.2.5 - python-novaclient>=9.0.0 - python-neutronclient>=6.3.0 + libvirt-python>=3.5.0 # LGPLv2+ + python-novaclient>=9.1.0 # Apache-2.0 + python-neutronclient>=6.3.0 # Apache-2.0 ovs = - python-novaclient>=9.0.0 - python-neutronclient>=6.3.0 + python-novaclient>=9.1.0 # Apache-2.0 + python-neutronclient>=6.3.0 # Apache-2.0 [global] setup-hooks = diff --git a/setup.py b/setup.py index 56be84db..566d8443 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,4 @@ -#!/usr/bin/env python - -# (C) Copyright 2014 Hewlett Packard Enterprise Development Company LP +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,8 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT 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 + setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index c259efc1..b879537e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,8 +3,8 @@ # process, which may cause wedges in the gate later. hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 -mock>=2.0 # BSD +mock>=2.0.0 # BSD coverage!=4.4,>=4.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -os-testr>=0.8.0 # Apache-2.0 prometheus_client +os-testr>=1.0.0 # Apache-2.0