Rename .melange-venv to .venv.

This simplifies a number of Jenkins jobs which currently, other
than directory names, could be the same for all OpenStack
projects.  By renaming the virtualenv directory, the redundant
Jenkins virtualenv build and copy jobs can be eliminated.

Change-Id: Ib2acff3dd078f3f13a16172f9068cd2b0620d55f
This commit is contained in:
James E. Blair 2011-12-05 11:20:42 -08:00
parent d408c606b0
commit dadee9bcf9
6 changed files with 7 additions and 5 deletions

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ build/*
build-stamp
melange.egg-info
.melange-venv
.venv
*.sqlite
*.log
tags

View File

@ -21,6 +21,7 @@
<itoumsn@nttdata.co.jp> <itoumsn@shayol>
<jake@ansolabs.com> <jake@markupisart.com>
<jake@ansolabs.com> <admin@jakedahn.com>
<jeblair@hp.com> <james.blair@rackspace.com>
<jaypipes@gmail.com> <jpipes@serialcoder>
<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>

View File

@ -48,7 +48,7 @@ Hisaki Ohara <hisaki.ohara@intel.com>
Ilya Alekseyev <ilyaalekseyev@acm.org>
Isaku Yamahata <yamahata@valinux.co.jp>
Jake Dahn <jake@ansolabs.com>
James E. Blair <james.blair@rackspace.com>
James E. Blair <jeblair@hp.com>
Jason Cannavale <jason.cannavale@rackspace.com>
Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com>

View File

@ -40,7 +40,7 @@ function process_option {
esac
}
venv=.melange-venv
venv=.venv
with_venv=tools/with_venv.sh
always_venv=0
never_venv=0

View File

@ -29,7 +29,7 @@ import sys
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
VENV = os.path.join(ROOT, '.melange-venv')
VENV = os.path.join(ROOT, '.venv')
PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
@ -123,7 +123,7 @@ def print_help():
To activate the Melange virtualenv for the extent of your current shell
session you can run:
$ source .melange-venv/bin/activate
$ source .venv/bin/activate
Or, if you prefer, you can run commands in the virtualenv on a case by case
basis by running:

View File

@ -1,4 +1,4 @@
#!/bin/bash
TOOLS=`dirname $0`
VENV=$TOOLS/../.melange-venv
VENV=$TOOLS/../.venv
source $VENV/bin/activate && $@