Merge "Mark trollius only be used under py2"
This commit is contained in:
commit
bcbed3720d
@ -442,7 +442,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD
|
||||
testresources>=2.0.0 # Apache-2.0/BSD
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
trollius>=1.0 # Apache-2.0
|
||||
trollius>=1.0;python_version=='2.7' # Apache-2.0
|
||||
ujson>=1.35 # BSD
|
||||
unittest2>=1.1.0 # BSD
|
||||
virtualbmc>=1.0.0 # Apache-2.0
|
||||
|
@ -214,7 +214,7 @@ dib-utils===0.0.8
|
||||
xlwt===1.3.0
|
||||
cliff===2.8.0
|
||||
os-brick===2.2.0
|
||||
trollius===1.0
|
||||
trollius===1.0;python_version=='2.7'
|
||||
scp===0.10.2
|
||||
xlrd===1.1.0
|
||||
python-zaqarclient===1.0.0
|
||||
|
@ -200,7 +200,7 @@ passlib===1.7.1
|
||||
dib-utils===0.0.11
|
||||
cliff===2.11.0
|
||||
os-brick===2.4.0
|
||||
trollius===2.2
|
||||
trollius===2.2;python_version=='2.7'
|
||||
scp===0.10.2
|
||||
python-zaqarclient===1.9.0
|
||||
funcsigs===1.0.2;python_version=='2.7'
|
||||
|
Loading…
x
Reference in New Issue
Block a user