From f33cb0e280eebfa2563326d927825dbb05f518ca Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 18 Jan 2016 22:41:31 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ib2ca987bdce9fa8e8cd4b5223aa69be53956a21f --- requirements.txt | 10 +++++----- setup.cfg | 6 +++--- test-requirements.txt | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/requirements.txt b/requirements.txt index 01bdcdad..c4b408f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,9 +2,9 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 -argparse -iso8601>=0.1.9 -requests!=2.9.0,>=2.8.1 -six>=1.9.0 +pbr>=1.6 # Apache-2.0 +argparse # PSF +iso8601>=0.1.9 # MIT +requests!=2.9.0,>=2.8.1 # Apache-2.0 +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 96e48cee..5d1c5e84 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,11 +26,11 @@ packages = kerberos = requests-kerberos>=0.6:python_version=='2.7' or python_version=='2.6' # MIT saml2 = - lxml>=2.3 + lxml>=2.3 # BSD betamax = betamax>=0.5.1 # Apache-2.0 - fixtures>=1.3.1 - mock>=1.2 + fixtures>=1.3.1 # Apache-2.0/BSD + mock>=1.2 # BSD [entry_points] diff --git a/test-requirements.txt b/test-requirements.txt index c46b5dc6..cb339bd4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,24 +3,24 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -flake8-docstrings==0.2.1.post1 +flake8-docstrings==0.2.1.post1 # MIT -coverage>=3.6 -discover -fixtures>=1.3.1 -mock>=1.2 -oauthlib>=0.6 +coverage>=3.6 # Apache-2.0 +discover # BSD +fixtures>=1.3.1 # Apache-2.0/BSD +mock>=1.2 # BSD +oauthlib>=0.6 # BSD oslo.config>=3.2.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -os-testr>=0.4.1 +os-testr>=0.4.1 # Apache-2.0 betamax>=0.5.1 # Apache-2.0 -pycrypto>=2.6 +pycrypto>=2.6 # Public Domain reno>=0.1.1 # Apache2 requests-mock>=0.7.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -tempest-lib>=0.13.0 -testrepository>=0.0.18 -testresources>=0.2.4 -testtools>=1.4.0 -WebOb>=1.2.3 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +tempest-lib>=0.13.0 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testresources>=0.2.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +WebOb>=1.2.3 # MIT