diff options
| author | James E. Blair <jeblair@hp.com> | 2011-12-05 11:24:30 -0800 |
|---|---|---|
| committer | James E. Blair <jeblair@hp.com> | 2011-12-05 13:13:31 -0800 |
| commit | ff30def8899c36626eacbbd5c2266c1a7b72d2cd (patch) | |
| tree | 3b7343edbb361ef26aa2b4b8c13be317ff63e8ab | |
| parent | b5b28e0591f7d88ae649ca3d5a2638b67e1e0e61 (diff) | |
| download | keystone-ff30def8899c36626eacbbd5c2266c1a7b72d2cd.tar.gz keystone-ff30def8899c36626eacbbd5c2266c1a7b72d2cd.tar.xz keystone-ff30def8899c36626eacbbd5c2266c1a7b72d2cd.zip | |
Rename .keystone-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: Ia831674b6e9c9d2be25b54e26c92009778d97a22
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | doc/source/developing.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
@@ -6,6 +6,7 @@ .pydevproject/ .settings/ .keystone-venv/ +.venv build/ dist/ doc/source/sourcecode @@ -1,4 +1,6 @@ <dolph.mathews@rackspace.com> <dolph.mathews@gmail.com> +<jeblair@hp.com> <corvus@gnu.org> +<jeblair@hp.com> <james.blair@rackspace.com> <joon.eo@gmail.com> <john.eo@rackspace.com> Khaled Hussein <khaled.hussein@gmail.com> KnightHacker <khaled.hussein@rackspace.com> Khaled Hussein <khaled.hussein@gmail.com> Khaled Hussein <khaled.hussein@rackspace.com> @@ -7,7 +7,7 @@ Dan Prince <dan.prince@rackspace.com> Dolph Mathews <dolph.mathews@gmail.com> gholt <gholt@brim.net> jabdul <abdulkader.j@hcl.com> -James E. Blair <corvus@gnu.org> +James E. Blair <jeblair@hp.com> Jason Cannavale <jason.cannavale@rackspace.com> Jay Pipes <jaypipes@gmail.com> Jenkins <jenkins@review.openstack.org> diff --git a/doc/source/developing.rst b/doc/source/developing.rst index f2317638..d266f2cd 100644 --- a/doc/source/developing.rst +++ b/doc/source/developing.rst @@ -31,10 +31,10 @@ this environment, use the command:: $ python tools/install_venv.py -This will create a local virtual environment in the directory ``.keystone-venv``. +This will create a local virtual environment in the directory ``.venv``. Once created, you can activate this virtualenv for your current shell using:: - $ source .keystone-venv/bin/activate + $ source .venv/bin/activate The virtual environment can be disabled using the command:: diff --git a/run_tests.sh b/run_tests.sh index 04a4a255..d33b8b83 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -52,7 +52,7 @@ function process_option { fi } -venv=.keystone-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 a9140910..097d114b 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -28,7 +28,7 @@ import sys ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) -VENV = os.path.join(ROOT, '.keystone-venv') +VENV = os.path.join(ROOT, '.venv') PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires') @@ -119,7 +119,7 @@ def print_help(): To activate the Keystone virtualenv for the extent of your current shell session you can run: - $ source .keystone-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 88532cae..c8d2940f 100755 --- a/tools/with_venv.sh +++ b/tools/with_venv.sh @@ -1,4 +1,4 @@ #!/bin/bash TOOLS=`dirname $0` -VENV=$TOOLS/../.keystone-venv +VENV=$TOOLS/../.venv source $VENV/bin/activate && $@ |