diff --git a/requirements.txt b/requirements.txt index 85ecb0ee1f..7452dca045 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. alembic>=0.7.2 pecan>=0.8.0 -pbr<2.0,>=0.11 +pbr<2.0,>=1.3 SQLAlchemy<1.1.0,>=0.9.7 anyjson>=0.3.3 Babel>=1.3 @@ -11,7 +11,7 @@ eventlet>=0.17.4 requests>=2.5.2 iso8601>=0.1.9 jsonrpclib -keystonemiddleware>=1.5.0 +keystonemiddleware>=2.0.0 netaddr>=0.7.12 python-neutronclient<3,>=2.3.11 WebOb>=1.2.3 @@ -21,18 +21,18 @@ oslo.config>=1.11.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 oslo.db>=1.12.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 -oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 -oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0 +oslo.log>=1.6.0 # Apache-2.0 +oslo.messaging>=1.16.0 # Apache-2.0 +oslo.middleware>=2.4.0 # Apache-2.0 oslo.rootwrap>=2.0.0 # Apache-2.0 oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.utils>=1.9.0 # Apache-2.0 PyMySQL>=0.6.2 # MIT License python-barbicanclient>=3.0.1 python-keystoneclient>=1.6.0 python-novaclient>=2.22.0 posix-ipc -pyOpenSSL>=0.11 +pyOpenSSL>=0.14 WSME>=0.7 pyasn1 pyasn1-modules diff --git a/setup.py b/setup.py index 056c16c2b8..d8080d05c8 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index b809d254b4..81ca953da9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,10 +7,11 @@ cliff>=1.13.0 # Apache-2.0 coverage>=3.6 discover fixtures>=1.3.1 -mock>=1.0 +mock>=1.1;python_version!='2.6' +mock==1.0.1;python_version=='2.6' python-subunit>=0.0.18 ordereddict -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.7.0 # Apache-2.0 testrepository>=0.0.18 testtools>=1.4.0 WebTest>=2.0