Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2017-03-03 13:41:23 +00:00 committed by Gerrit Code Review
commit cdffbffecb
3 changed files with 3 additions and 3 deletions

View File

@ -7,7 +7,7 @@
# adding a new feature to oslo.utils means adding a new dependency,
# that is a likely indicator that the feature belongs somewhere else.
pbr>=1.8 # Apache-2.0
pbr>=2.0.0 # Apache-2.0
six>=1.9.0 # MIT
funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0
iso8601>=0.1.11 # MIT

View File

@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
setup_requires=['pbr>=1.8'],
setup_requires=['pbr>=2.0.0'],
pbr=True)

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
python-subunit>=0.0.18 # Apache-2.0/BSD