diff options
author | 2017-11-01 09:58:36 +0000 | |
---|---|---|
committer | 2017-11-01 09:58:36 +0000 | |
commit | 1ab9e70f4acbea14df8b2936636477873ab70480 (patch) | |
tree | bbb3c143d053710e356528f2beb4975781003052 | |
parent | 15ce86943f97857173114fca89246b1cbba1925e (diff) | |
parent | a30e78965fff8c0eeb953d9cc738526ab0b435bc (diff) |
Merge "Sync requirements with OpenStack Pike"
-rw-r--r-- | modules/requirements.txt | 2 | ||||
-rw-r--r-- | modules/setup.py | 2 | ||||
-rw-r--r-- | modules/test-requirements.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/requirements.txt b/modules/requirements.txt index 2793dd4cf..0718fa3b0 100644 --- a/modules/requirements.txt +++ b/modules/requirements.txt @@ -1,3 +1,3 @@ paramiko>=2.0 # LGPLv2.1+ mock>=2.0 # BSD -requests!=2.12.2,>=2.10.0 # Apache-2.0 +requests>=2.14.2 # Apache-2.0 diff --git a/modules/setup.py b/modules/setup.py index a1e9b3bb2..46309ef1c 100644 --- a/modules/setup.py +++ b/modules/setup.py @@ -18,5 +18,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/modules/test-requirements.txt b/modules/test-requirements.txt index c264540c0..1ae13c002 100644 --- a/modules/test-requirements.txt +++ b/modules/test-requirements.txt @@ -1,2 +1,2 @@ nose # LGPL -coverage>=4.0 # Apache-2.0 +coverage!=4.4,>=4.0 # Apache-2.0 |