From 5e1d6b93b0539285a4253ac4015e448c1618a9b4 Mon Sep 17 00:00:00 2001 From: Masayuki Igawa Date: Thu, 27 Apr 2017 16:42:40 +0900 Subject: [PATCH] Update requirements This commit updates requirements for syncing to the global requirements. Change-Id: I99ddea7e8a2b84a77437fabb6ea7f27a4fe56334 --- requirements.txt | 12 ++++++------ setup.py | 2 +- test-requirements.txt | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6ea5d57..33a1044 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 -SQLAlchemy>=0.8.2 -alembic>=0.4.1 -oslo.config>=1.4.0.0a3 -coverage>=4.3 -xmltodict>=0.10.1 # MIT +pbr!=2.1.0,>=2.0.0 # Apache-2.0 +SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +alembic>=0.8.10 # MIT +oslo.config>=3.22.0 # Apache-2.0 +coverage>=4.0 # Apache-2.0 +xmltodict>=0.10.1 # MIT diff --git a/setup.py b/setup.py index 056c16c..566d844 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 113c6eb..2a58c66 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,18 +4,18 @@ hacking<0.11,>=0.10.0 -docutils>=0.11 # OSI-Approved Open Source, Public Domain -fixtures>=0.3.14 -python-subunit>=0.0.18 -sphinx>=1.5.1 -oslosphinx>=2.5.0 # Apache-2.0 +docutils>=0.11 # OSI-Approved Open Source, Public Domain +fixtures>=3.0.0 # Apache-2.0/BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx>=1.5.1 # BSD +oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 -PyMySql -psycopg2 -os-testr -reno>=0.1.1 # Apache2 -oslo.concurrency>=3.5.0 -six>=1.5.2 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +PyMySQL>=0.7.6 # MIT License +psycopg2>=2.5 # LGPL/ZPL +os-testr>=0.8.0 # Apache-2.0 +reno>=1.8.0 # Apache-2.0 +oslo.concurrency>=3.8.0 # Apache-2.0 +six>=1.9.0 # MIT