Merge "Use swift master"
This commit is contained in:
commit
a1f494da64
@ -6,9 +6,9 @@ discover
|
||||
fixtures>=0.3.14
|
||||
httplib2>=0.7.5
|
||||
http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
|
||||
http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift
|
||||
mock>=1.0
|
||||
mox>=0.5.3
|
||||
swift
|
||||
# Docs Requirements
|
||||
docutils==0.9.1
|
||||
oslo.sphinx
|
||||
|
2
tox.ini
2
tox.ini
@ -6,7 +6,7 @@ envlist = py26,py27,py33,pep8
|
||||
[testenv]
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
install_command = pip install -U --allow-external pytidylib --allow-insecure pytidylib {opts} {packages}
|
||||
install_command = pip install -U --allow-external pytidylib --allow-insecure pytidylib --allow-external netifaces --allow-insecure netifaces {opts} {packages}
|
||||
usedevelop = True
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
LANG=en_US.UTF-8
|
||||
|
Loading…
Reference in New Issue
Block a user