Merge lp:~xtoddx/nova/glance-venv into lp:~hudson-openstack/nova/trunk

[Todd Willey]

Add glance to venv. I'm doing this as a .pth file similar to how we do it for nova. I think we should have all openstack components as .pth files and not as pip packages in case we're working on developing a feature that touches multiple packages.

lp:~citrix-openstack has a branch (lp:~citrix-openstack/nova/xenapi-glance-2) that adds glance to pip-requires instead. We should figure out which makes more sense and make sure we don't conflict.

[Jay Pipes (jaypipes)]

I don't think we should treat Glance differently than any other dependency, so I'm going to vote no on this one...plus, there's a bug that I'm currently addressing this issue in: https://bugs.launchpad.net/nova/+bug/704176

review: Disapprove

[lp:~xtoddx/nova/glance-venv]

575. By Todd Willey on 2011-01-17

pep8 on tools/nova_venv.py, even though it isn't checked by hudson.

[Soren Hansen (soren)]

Bexar GammaFreeze has kicked in, deferred to Cactus. Setting to "Work in Progress" to clear the review queue. Feel free to set back to "Needs Review" once Cactus opens up (of if this issue gets promoted to a release critical one).

review: Needs Resubmitting

Unmerged revisions

575. By Todd Willey on 2011-01-17

pep8 on tools/nova_venv.py, even though it isn't checked by hudson.

574. By Todd Willey on 2011-01-17

clean up file writes, and use two-levels of dirname calls for right path.

573. By Todd Willey on 2011-01-17

Add glance to venv.

=== modified file 'tools/install_venv.py'
--- tools/install_venv.py	2011-01-11 18:11:30 +0000
+++ tools/install_venv.py	2011-01-17 22:37:41 +0000
@@ -30,108 +30,120 @@
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 VENV = os.path.join(ROOT, '.nova-venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
-TWISTED_NOVA='http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz'
+TWISTED_NOVA = 'http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz'
+
 
 def die(message, *args):
-  print >>sys.stderr, message % args
-  sys.exit(1)
+    print >>sys.stderr, message % args
+    sys.exit(1)
 
 
 def run_command(cmd, redirect_output=True, check_exit_code=True):
-  """
-  Runs a command in an out-of-process shell, returning the
-  output of that command.  Working directory is ROOT.
-  """
-  if redirect_output:
-    stdout = subprocess.PIPE
-  else:
-    stdout = None
-
-  proc = subprocess.Popen(cmd, cwd=ROOT, stdout=stdout)
-  output = proc.communicate()[0]
-  if check_exit_code and proc.returncode != 0:
-    die('Command "%s" failed.\n%s', ' '.join(cmd), output)
-  return output
-
-
-HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install'], check_exit_code=False).strip())
-HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv'], check_exit_code=False).strip())
+    """
+    Runs a command in an out-of-process shell, returning the
+    output of that command.  Working directory is ROOT.
+    """
+    if redirect_output:
+        stdout = subprocess.PIPE
+    else:
+        stdout = None
+
+    proc = subprocess.Popen(cmd, cwd=ROOT, stdout=stdout)
+    output = proc.communicate()[0]
+    if check_exit_code and proc.returncode != 0:
+        die('Command "%s" failed.\n%s', ' '.join(cmd), output)
+    return output
+
+
+HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install'],
+                        check_exit_code=False).strip())
+HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv'],
+                      check_exit_code=False).strip())
 
 
 def check_dependencies():
-  """Make sure virtualenv is in the path."""
+    """Make sure virtualenv is in the path."""
 
-  if not HAS_VIRTUALENV:
-    print 'not found.'
-    # Try installing it via easy_install...
-    if HAS_EASY_INSTALL:
-      print 'Installing virtualenv via easy_install...',
-      if not (run_command(['which', 'easy_install']) and 
-              run_command(['easy_install', 'virtualenv'])):
-        die('ERROR: virtualenv not found.\n\nNova development requires virtualenv,'
-            ' please install it using your favorite package management tool')
-      print 'done.'
-  print 'done.'
+    if not HAS_VIRTUALENV:
+        print 'not found.'
+        # Try installing it via easy_install...
+        if HAS_EASY_INSTALL:
+            print 'Installing virtualenv via easy_install...',
+            if not (run_command(['which', 'easy_install']) and
+                    run_command(['easy_install', 'virtualenv'])):
+                die('ERROR: virtualenv not found.\n\nNova development '
+                    'requires virtualenv, please install it using your '
+                    'favorite package management tool')
+            print 'done.'
+    print 'done.'
 
 
 def create_virtualenv(venv=VENV):
-  """Creates the virtual environment and installs PIP only into the
-  virtual environment
-  """
-  print 'Creating venv...',
-  run_command(['virtualenv', '-q', '--no-site-packages', VENV])
-  print 'done.'
-  print 'Installing pip in virtualenv...',
-  if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip():
-    die("Failed to install pip.")
-  print 'done.'
+    """Creates the virtual environment and installs PIP only into the
+    virtual environment
+    """
+    print 'Creating venv...',
+    run_command(['virtualenv', '-q', '--no-site-packages', VENV])
+    print 'done.'
+    print 'Installing pip in virtualenv...',
+    if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip():
+        die("Failed to install pip.")
+    print 'done.'
 
 
 def install_dependencies(venv=VENV):
-  print 'Installing dependencies with pip (this can take a while)...'
-  # Install greenlet by hand - just listing it in the requires file does not
-  # get it in stalled in the right order
-  run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, 'greenlet'],
-              redirect_output=False)
-  run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, '-r', PIP_REQUIRES],
-              redirect_output=False)
-  run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv, TWISTED_NOVA],
-              redirect_output=False)
-
-
-  # Tell the virtual env how to "import nova"
-  pthfile = os.path.join(venv, "lib", "python2.6", "site-packages", "nova.pth")
-  f = open(pthfile, 'w')
-  f.write("%s\n" % ROOT)
+    print 'Installing dependencies with pip (this can take a while)...'
+    # Install greenlet by hand - just listing it in the requires file does not
+    # get it in stalled in the right order
+    run_command(
+        ['tools/with_venv.sh', 'pip', 'install', '-E', venv, 'greenlet'],
+        redirect_output=False)
+    run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv,
+                 '-r', PIP_REQUIRES], redirect_output=False)
+    run_command(['tools/with_venv.sh', 'pip', 'install', '-E', venv,
+                 TWISTED_NOVA], redirect_output=False)
+
+    # Tell the virtual env how to "import nova"
+    pthfile = os.path.join(venv, "lib", "python2.6", "site-packages",
+                           "nova.pth")
+    with open(pthfile, 'w') as f:
+        f.write("%s\n" % ROOT)
+
+    # Tell the virtual env how to "import glance"
+    import glance
+    glancedir = os.path.dirname(os.path.dirname(glance.__file__))
+    pthfile = os.path.join(venv, "lib", "python2.6", "site-packages",
+                           "glance.pth")
+    with open(pthfile, 'w') as f:
+        f.write("%s\n" % glancedir)
 
 
 def print_help():
-  help = """
- Nova development environment setup is complete.
-
- Nova development uses virtualenv to track and manage Python dependencies
- while in development and testing.
-
- To activate the Nova virtualenv for the extent of your current shell session
- you can run:
-
- $ source .nova-venv/bin/activate 
-
- Or, if you prefer, you can run commands in the virtualenv on a case by case
- basis by running:
+    help = """Nova development environment setup is complete.
+
+Nova development uses virtualenv to track and manage Python dependencies
+while in development and testing.
+
+To activate the Nova virtualenv for the extent of your current shell session
+you can run:
+
+ $ source .nova-venv/bin/activate
+
+Or, if you prefer, you can run commands in the virtualenv on a case by case
+basis by running:
 
  $ tools/with_venv.sh <your command>
 
- Also, make test will automatically use the virtualenv.
-  """
-  print help
+Also, make test will automatically use the virtualenv.
+"""
+    print help
 
 
 def main(argv):
-  check_dependencies()
-  create_virtualenv()
-  install_dependencies()
-  print_help()
+    check_dependencies()
+    create_virtualenv()
+    install_dependencies()
+    print_help()
 
 if __name__ == '__main__':
-  main(sys.argv)
+    main(sys.argv)