diff options
author | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-05-06 20:07:49 -0700 |
---|---|---|
committer | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-05-13 00:57:31 -0700 |
commit | 8ac57c720c873f9c64e1ac94c8748fce48bbca54 (patch) | |
tree | f47ab7824ccf365ee99e0289eadf0819874d7a02 /tools | |
parent | 73f81e029f02a050f4869c7d13ca3a2913ed8355 (diff) | |
download | ironic-8ac57c720c873f9c64e1ac94c8748fce48bbca54.tar.gz |
Implement initial draft of a Pecan-based API.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/install_venv_common.py | 22 | ||||
-rw-r--r-- | tools/pip-requires | 5 |
2 files changed, 17 insertions, 10 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 0401a958f..914fcf17e 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -24,6 +24,8 @@ environment, it should be kept strictly compatible with Python 2.6. Synced in from openstack-common """ +from __future__ import print_function + import optparse import os import subprocess @@ -42,7 +44,7 @@ class InstallVenv(object): self.project = project def die(self, message, *args): - print >> sys.stderr, message % args + print(message % args, file=sys.stderr) sys.exit(1) def check_python_version(self): @@ -89,20 +91,20 @@ class InstallVenv(object): virtual environment. """ if not os.path.isdir(self.venv): - print 'Creating venv...', + print('Creating venv...', end=' ') if no_site_packages: self.run_command(['virtualenv', '-q', '--no-site-packages', self.venv]) else: self.run_command(['virtualenv', '-q', self.venv]) - print 'done.' - print 'Installing pip in venv...', + print('done.') + print('Installing pip in venv...', end=' ') if not self.run_command(['tools/with_venv.sh', 'easy_install', 'pip>1.0']).strip(): self.die("Failed to install pip.") - print 'done.' + print('done.') else: - print "venv already exists..." + print("venv already exists...") pass def pip_install(self, *args): @@ -111,7 +113,7 @@ class InstallVenv(object): redirect_output=False) def install_dependencies(self): - print 'Installing dependencies with pip (this can take a while)...' + print('Installing dependencies with pip (this can take a while)...') # First things first, make sure our venv has the latest pip and # distribute. @@ -153,12 +155,12 @@ class Distro(InstallVenv): return if self.check_cmd('easy_install'): - print 'Installing virtualenv via easy_install...', + print('Installing virtualenv via easy_install...', end=' ') if self.run_command(['easy_install', 'virtualenv']): - print 'Succeeded' + print('Succeeded') return else: - print 'Failed' + print('Failed') self.die('ERROR: virtualenv not found.\n\n%s development' ' requires virtualenv, please install it using your' diff --git a/tools/pip-requires b/tools/pip-requires index 05a103ee9..30e70e288 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,3 +1,5 @@ +d2to1>=0.2.10,<0.3 +pbr>=0.5,<0.6 SQLAlchemy>=0.7.8,<0.7.99 Cheetah>=2.4.4 amqplib>=0.6.1 @@ -28,3 +30,6 @@ python-keystoneclient>=0.2.0 stevedore>=0.7 websockify<0.4 oslo.config>=1.1.0 +Flask==0.9 +pecan>=0.2.0 +wsme>=0.5b1 |