From 29c6c6f95cd4af665015eb445dcbccd62eb179b1 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 1 Sep 2016 21:54:46 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I50baa49c8edd8feab768f18d07936a2684c06755 --- requirements.txt | 39 +++++++++++++++++++++------------------ setup.cfg | 0 setup.py | 18 ++++++++++++------ test-requirements.txt | 35 +++++++++++++++++++---------------- 4 files changed, 52 insertions(+), 40 deletions(-) mode change 100755 => 100644 requirements.txt mode change 100755 => 100644 setup.cfg diff --git a/requirements.txt b/requirements.txt old mode 100755 new mode 100644 index f189d10c2..431305762 --- a/requirements.txt +++ b/requirements.txt @@ -1,22 +1,25 @@ -oslo.config -oslo.log -oslo.middleware -oslo.serialization -oslo.utils +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +oslo.config>=3.14.0 # Apache-2.0 +oslo.log>=1.14.0 # Apache-2.0 +oslo.middleware>=3.0.0 # Apache-2.0 +oslo.serialization>=1.10.0 # Apache-2.0 +oslo.utils>=3.16.0 # Apache-2.0 -python-keystoneclient +python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0 -falcon -keystonemiddleware -pastedeploy -pbr -six -pyparsing -voluptuous +falcon>=0.1.6 # Apache-2.0 +keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0 +PasteDeploy>=1.5.0 # MIT +pbr>=1.6 # Apache-2.0 +six>=1.9.0 # MIT +pyparsing>=2.0.1 # MIT +voluptuous>=0.8.9 # BSD License #influxdb #cassandra-driver>=2.1.4,!=3.6.0 # Apache-2.0 -eventlet -kafka-python>=0.9.5,<1.0.0 -simplejson -monasca-common>=0.0.2 -sqlalchemy +eventlet!=0.18.3,>=0.18.2 # MIT +kafka-python<1.0.0,>=0.9.5 # Apache-2.0 +simplejson>=2.2.0 # MIT +monasca-common>=1.0.0 # Apache-2.0 +SQLAlchemy<1.1.0,>=1.0.10 # MIT diff --git a/setup.cfg b/setup.cfg old mode 100755 new mode 100644 diff --git a/setup.py b/setup.py index ffe71fff0..782bb21f0 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,9 +14,16 @@ # limitations under the License. # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT -from setuptools import setup +import setuptools -setup( - setup_requires=['pbr'], - pbr=True, -) +# 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>=1.8'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index a03b221bc..aa009caea 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,18 +1,21 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 hacking<0.11,>=0.10.0 -Babel>=1.3 -coverage>=3.6 -fixtures>=0.3.14 -flake8==2.2.4 -pep8==1.5.7 -httplib2>=0.7.5 -mock>=1.0 -funcsigs -mox>=0.5.3 -nose -oslotest -python-subunit>=0.0.18 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=0.9.34 -tempest-lib +Babel>=2.3.4 # BSD +coverage>=3.6 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD +flake8<2.6.0,>=2.5.4 # MIT +pep8==1.5.7 # MIT +httplib2>=0.7.5 # MIT +mock>=2.0 # BSD +funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0 +mox>=0.5.3 # Apache-2.0 +nose # LGPL +oslotest>=1.10.0 # Apache-2.0 +python-subunit>=0.0.18 # Apache-2.0/BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +tempest-lib>=0.14.0 # Apache-2.0