openstack
/
nova
Code Issues Proposed changes

Rename .nova-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: Ieaf1dac3207ecb34b911c7edcd2086809abdf49e
This commit is contained in:
James E. Blair 2011-12-08 15:14:48 -08:00
parent 10c829ff39
commit 5235106e95
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ build/*
build-stamp build-stamp
nova.egg-info nova.egg-info
.nova-venv .nova-venv
.venv
*.sqlite *.sqlite
*.log *.log
po/*.pot po/*.pot

2
.mailmap
View File

@ -25,6 +25,8 @@
<jake@ansolabs.com> <jake@markupisart.com> <jake@ansolabs.com> <jake@markupisart.com>
<jake@ansolabs.com> <admin@jakedahn.com> <jake@ansolabs.com> <admin@jakedahn.com>
<jaypipes@gmail.com> <jpipes@serialcoder> <jaypipes@gmail.com> <jpipes@serialcoder>
<jeblair@hp.com> <james.blair@rackspace.com>
<jeblair@hp.com> <corvus@inaugust.com>
<jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local> <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
<jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com> <jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
<jmckenty@gmail.com> <joshua.mckenty@nasa.gov> <jmckenty@gmail.com> <joshua.mckenty@nasa.gov>

2
Authors
View File

@ -55,7 +55,7 @@ Hisaki Ohara <hisaki.ohara@intel.com>
Ilya Alekseyev <ilyaalekseyev@acm.org> Ilya Alekseyev <ilyaalekseyev@acm.org>
Isaku Yamahata <yamahata@valinux.co.jp> Isaku Yamahata <yamahata@valinux.co.jp>
Jake Dahn <jake@ansolabs.com> 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 Cannavale <jason.cannavale@rackspace.com>
Jason Koelker <jason@koelker.net> Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com> Jay Pipes <jaypipes@gmail.com>

4
doc/source/devref/development.environment.rst
View File

@ -96,7 +96,7 @@ Grab the code from GitHub::
Running unit tests Running unit tests
------------------ ------------------
The unit tests will run by default inside a virtualenv in the ``.nova-venv`` The unit tests will run by default inside a virtualenv in the ``.venv``
directory. Run the unit tests by doing:: directory. Run the unit tests by doing::
./run_tests.sh ./run_tests.sh
@ -130,7 +130,7 @@ If all goes well, you should get a message something like this::
To activate the Nova virtualenv for the extent of your current shell session To activate the Nova virtualenv for the extent of your current shell session
you can run:: you can run::
$ source .nova-venv/bin/activate $ source .venv/bin/activate
Or, if you prefer, you can run commands in the virtualenv on a case by case Or, if you prefer, you can run commands in the virtualenv on a case by case
basis by running:: basis by running::

2
run_tests.sh
View File

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

4
tools/install_venv.py
View File

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

2
tools/with_venv.sh
View File

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