Merge "Sync from global requirements"
This commit is contained in:
commit
722974ef26
@ -1,11 +1,11 @@
|
|||||||
# The order of packages is significant, because pip processes them in the order
|
# 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
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
PyYAML>=3.1.0
|
PyYAML>=3.1.0 # MIT
|
||||||
Jinja2>=2.6 # BSD License (3 clause)
|
Jinja2>=2.8 # BSD License (3 clause)
|
||||||
pbr<2.0,>=1.6
|
pbr>=1.6 # Apache-2.0
|
||||||
Babel>=1.3
|
Babel>=1.3 # BSD
|
||||||
oslo.config>=3.2.0 # Apache-2.0
|
oslo.config>=3.2.0 # Apache-2.0
|
||||||
oslo.log>=1.14.0 # Apache-2.0
|
oslo.log>=1.14.0 # Apache-2.0
|
||||||
six>=1.9.0
|
six>=1.9.0 # MIT
|
||||||
PyMySQL>=0.6.2 # MIT License
|
PyMySQL>=0.6.2 # MIT License
|
||||||
|
2
setup.py
2
setup.py
@ -25,5 +25,5 @@ except ImportError:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr>=1.3'],
|
setup_requires=['pbr>=1.8'],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
@ -4,13 +4,13 @@
|
|||||||
|
|
||||||
hacking<0.11,>=0.10.0
|
hacking<0.11,>=0.10.0
|
||||||
|
|
||||||
coverage>=3.6
|
coverage>=3.6 # Apache-2.0
|
||||||
discover
|
discover # BSD
|
||||||
python-subunit>=0.0.18
|
python-subunit>=0.0.18 # Apache-2.0/BSD
|
||||||
reno>=0.1.1 # Apache2
|
reno>=0.1.1 # Apache2
|
||||||
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
|
||||||
oslosphinx>=2.5.0 # Apache-2.0
|
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
||||||
oslotest>=1.10.0 # Apache-2.0
|
oslotest>=1.10.0 # Apache-2.0
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||||
testscenarios>=0.4
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
testtools>=1.4.0
|
testtools>=1.4.0 # MIT
|
||||||
|
Loading…
Reference in New Issue
Block a user