diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-02 19:07:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-02 19:07:19 +0000 |
| commit | 18bfc8c3286894c49267312c31eb5eb8331d28ac (patch) | |
| tree | 32f5b61d01629feab442e0f3d17e52e5ac0f81f3 | |
| parent | 11ec45ffc7c1a31068facc3764f1a63a6b85878f (diff) | |
| parent | d04cba2d606f9478c99bc656cb974e37b17094ef (diff) | |
| download | kolla-18bfc8c3286894c49267312c31eb5eb8331d28ac.tar.gz kolla-18bfc8c3286894c49267312c31eb5eb8331d28ac.zip | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index 0839e7557..fb0390e52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.8 # Apache-2.0 +pbr>=2.0.0 # Apache-2.0 docker-py>=1.8.1 # Apache-2.0 Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) gitdb>=0.6.4 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) six>=1.9.0 # MIT oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 -oslo.utils>=3.18.0 # Apache-2.0 -setuptools!=24.0.0,>=16.0 # PSF/ZPL +oslo.utils>=3.20.0 # Apache-2.0 +setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,>=16.0 # PSF/ZPL pycrypto>=2.6 # Public Domain netaddr!=0.7.16,>=0.7.13 # BSD @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8'], + setup_requires=['pbr>=2.0.0'], pbr=True) |