Skip to content

Commit

Permalink
Rename .glance-venv to .venv.
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit 37fc2b0)

Change-Id: I7916783d863e5184bad8293c3aed5ba119e374a9
  • Loading branch information
jeblair authored and markmc committed Jan 5, 2012
1 parent 6baaaa0 commit 845646e
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions .bzrignore
Expand Up @@ -2,6 +2,7 @@
glance.egg-info
tests.sqlite
*.glance-venv
.venv/
dist/
ChangeLog
*.pid
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,4 +2,5 @@
*.swp
*.log
.glance-venv
.venv
tests.sqlite
2 changes: 2 additions & 0 deletions .mailmap
Expand Up @@ -9,3 +9,5 @@
<rick@openstack.org> <rclark@chat-blanc>
<soren.hansen@rackspace.com> <soren@linux2go.dk>
<soren.hansen@rackspace.com> <soren@openstack.org>
<jeblair@hp.com> <corvus@gnu.org>
<jeblair@hp.com> <james.blair@rackspace.com>
1 change: 1 addition & 0 deletions Authors
Expand Up @@ -12,6 +12,7 @@ Ewan Mellor <ewan.mellor@citrix.com>
Isaku Yamahata <yamahata@valinux.co.jp>
Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com>
James E. Blair <jeblair@hp.com>
Jinwoo 'Joseph' Suh <jsuh@isi.edu>
Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Josh Kearney <josh@jk0.org>
Expand Down
2 changes: 1 addition & 1 deletion run_tests.sh
Expand Up @@ -29,7 +29,7 @@ function process_option {
esac
}

venv=.glance-venv
venv=.venv
with_venv=tools/with_venv.sh
always_venv=0
never_venv=0
Expand Down
4 changes: 2 additions & 2 deletions tools/install_venv.py
Expand Up @@ -28,7 +28,7 @@


ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
VENV = os.path.join(ROOT, '.glance-venv')
VENV = os.path.join(ROOT, '.venv')
PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')


Expand Down Expand Up @@ -124,7 +124,7 @@ def print_help():
To activate the Glance virtualenv for the extent of your current shell session
you can run:
$ source .glance-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:
Expand Down
2 changes: 1 addition & 1 deletion tools/with_venv.sh
@@ -1,4 +1,4 @@
#!/bin/bash
TOOLS=`dirname $0`
VENV=$TOOLS/../.glance-venv
VENV=$TOOLS/../.venv
source $VENV/bin/activate && $@

0 comments on commit 845646e

Please sign in to comment.