diff options
author | James E. Blair <jeblair@hp.com> | 2011-12-08 15:14:48 -0800 |
---|---|---|
committer | James E. Blair <jeblair@hp.com> | 2011-12-08 15:17:51 -0800 |
commit | 5235106e95681a2942a083aff7c00d385bd10489 (patch) | |
tree | e1eb837b34c83c46d93e5f6173c7df2bf2b6422b | |
parent | 10c829ff39500d68f1e3493f5fa1a4e2f5bc26d6 (diff) | |
download | nova-5235106e95681a2942a083aff7c00d385bd10489.tar.gz |
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
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .mailmap | 2 | ||||
-rw-r--r-- | Authors | 2 | ||||
-rw-r--r-- | doc/source/devref/development.environment.rst | 4 | ||||
-rwxr-xr-x | run_tests.sh | 2 | ||||
-rw-r--r-- | tools/install_venv.py | 4 | ||||
-rwxr-xr-x | tools/with_venv.sh | 2 |
7 files changed, 10 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 3ef41c879a..64a96d0a86 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ build/* build-stamp nova.egg-info .nova-venv +.venv *.sqlite *.log po/*.pot
\ No newline at end of file @@ -25,6 +25,8 @@ <jake@ansolabs.com> <jake@markupisart.com> <jake@ansolabs.com> <admin@jakedahn.com> <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@yyj-dhcp171.corp.flock.com> <jmckenty@gmail.com> <joshua.mckenty@nasa.gov> @@ -55,7 +55,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> diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst index 1e81b4cfa1..ce5b721b7d 100644 --- a/doc/source/devref/development.environment.rst +++ b/doc/source/devref/development.environment.rst @@ -96,7 +96,7 @@ Grab the code from GitHub:: 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:: ./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 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 basis by running:: diff --git a/run_tests.sh b/run_tests.sh index 23e9783b1f..0b2acbc003 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -42,7 +42,7 @@ function process_option { esac } -venv=.nova-venv +venv=.venv with_venv=tools/with_venv.sh always_venv=0 never_venv=0 diff --git a/tools/install_venv.py b/tools/install_venv.py index e5279a8409..35afb44378 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -31,7 +31,7 @@ import platform 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') 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 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 basis by running: diff --git a/tools/with_venv.sh b/tools/with_venv.sh index 99d1ac18ff..c8d2940fc7 100755 --- a/tools/with_venv.sh +++ b/tools/with_venv.sh @@ -1,4 +1,4 @@ #!/bin/bash TOOLS=`dirname $0` -VENV=$TOOLS/../.nova-venv +VENV=$TOOLS/../.venv source $VENV/bin/activate && $@ |