summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-06-03 13:32:42 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-06-03 13:32:42 -0700
commitb1fb63713e592f8d7e8406287ce77e345d2ad30f (patch)
tree0b2200302c745424e6f19d6a7f8026e9c9859113 /tools
parentcc7aec17929414c58bbfdde609930e66e6f17028 (diff)
parent05eb0abdbfcab6c0f96feb8828439204cbdd3960 (diff)
downloadnova-b1fb63713e592f8d7e8406287ce77e345d2ad30f.tar.gz
nova-b1fb63713e592f8d7e8406287ce77e345d2ad30f.tar.xz
nova-b1fb63713e592f8d7e8406287ce77e345d2ad30f.zip
trunk merge after 2b hit
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv.py2
-rw-r--r--tools/pip-requires4
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 812b1dd0f..f4b6583ed 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -36,7 +36,7 @@ PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
def die(message, *args):
- print >>sys.stderr, message % args
+ print >> sys.stderr, message % args
sys.exit(1)
diff --git a/tools/pip-requires b/tools/pip-requires
index 8f8018765..e81ef944a 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -17,8 +17,7 @@ redis==2.0.0
routes==1.12.3
WebOb==0.9.8
wsgiref==0.1.2
-mox==0.5.0
--f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
+mox==0.5.3
greenlet==0.3.1
nose
bzr
@@ -34,3 +33,4 @@ suds==0.4
coverage
nosexcover
GitPython
+paramiko