diff options
| -rw-r--r-- | requirements.txt | 15 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt index f35882fb5b..c6f3390166 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,15 +2,16 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr<2.0,>=0.11 +pbr<2.0,>=1.3 SQLAlchemy<1.1.0,>=0.9.7 boto>=2.32.1 decorator>=3.4.0 eventlet>=0.17.4 Jinja2>=2.6 # BSD License (3 clause) -keystonemiddleware>=1.5.0 +keystonemiddleware>=2.0.0 lxml>=2.3 -Routes!=2.0,!=2.1,>=1.12.3 +Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' +Routes!=2.0,>=1.12.3;python_version!='2.7' WebOb>=1.2.3 greenlet>=0.3.2 PasteDeploy>=1.5.0 @@ -36,15 +37,15 @@ websockify<0.7,>=0.6.0 oslo.concurrency>=2.1.0 # Apache-2.0 oslo.config>=1.11.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 +oslo.log>=1.6.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 oslo.db>=1.12.0 # Apache-2.0 oslo.rootwrap>=2.0.0 # Apache-2.0 -oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.messaging>=1.16.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 rfc3986>=0.2.0 # Apache-2.0 -oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0 +oslo.middleware>=2.4.0 # Apache-2.0 psutil<2.0.0,>=1.1.1 oslo.versionedobjects!=0.5.0,>=0.3.0 alembic>=0.7.2 @@ -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 465cb1c061..65da364e4d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,8 @@ hacking<0.11,>=0.10.0 coverage>=3.6 discover fixtures>=1.3.1 -mock>=1.0 +mock!=1.1.4,>=1.1;python_version!='2.6' +mock==1.0.1;python_version=='2.6' mox3>=0.7.0 psycopg2 PyMySQL>=0.6.2 # MIT License @@ -17,7 +18,7 @@ requests-mock>=0.6.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinxcontrib-seqdiag oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.7.0 # Apache-2.0 testrepository>=0.0.18 testtools>=1.4.0 tempest-lib>=0.6.1 |