Merge "Updated from global requirements"
This commit is contained in:
commit
9b3be536c2
|
@ -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.
|
||||
|
||||
pbr>=0.11,<2.0
|
||||
pbr<2.0,>=0.11
|
||||
six>=1.9.0
|
||||
monotonic>=0.1 # Apache-2.0
|
||||
monotonic>=0.1 # Apache-2.0
|
||||
futures>=3.0
|
||||
|
|
1
setup.py
1
setup.py
|
@ -1,4 +1,3 @@
|
|||
#!/usr/bin/env python
|
||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
hacking<0.11,>=0.10.0
|
||||
|
||||
# Used for making sure the eventlet executors work.
|
||||
eventlet>=0.17.3
|
||||
eventlet>=0.17.4
|
||||
|
||||
coverage>=3.6
|
||||
discover
|
||||
python-subunit>=0.0.18
|
||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
||||
oslosphinx>=2.5.0 # Apache-2.0
|
||||
oslotest>=1.5.1 # Apache-2.0
|
||||
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
||||
oslosphinx>=2.5.0 # Apache-2.0
|
||||
oslotest>=1.5.1 # Apache-2.0
|
||||
testrepository>=0.0.18
|
||||
testscenarios>=0.4
|
||||
testtools>=0.9.36,!=1.2.0
|
||||
testtools>=1.4.0
|
||||
|
|
Loading…
Reference in New Issue