Merge "Use swift master"

This commit is contained in:
Jenkins 2014-01-29 15:12:06 +00:00 committed by Gerrit Code Review
commit a1f494da64
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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