Rename .quantum-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: I93c7f6577b4c3a76b021f002bda59fcb8fac3f95
This commit is contained in:
James E. Blair 2011-12-23 15:02:57 -08:00
parent 5b23b5ef6b
commit a90fab1193
7 changed files with 8 additions and 6 deletions

View File

@ -3,6 +3,7 @@ quantum.egg-info
quantum_tests.sqlite quantum_tests.sqlite
quantum.sqlite quantum.sqlite
*.quantum-venv *.quantum-venv
.venv
dist/ dist/
ChangeLog ChangeLog
*.pid *.pid

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ run_tests.err.log
run_tests.log run_tests.log
tests/ tests/
.quantum-venv/ .quantum-venv/
.venv/

View File

@ -70,7 +70,7 @@ this)
# Install into $HOME/.local/... # Install into $HOME/.local/...
c) python setup.py install --venv c) python setup.py install --venv
# Creates and installs into a virtual-env at ~/.quantum-venv # Creates and installs into a virtual-env at ~/.venv
# -- Configuring Quantum plug-in # -- Configuring Quantum plug-in

View File

@ -208,7 +208,7 @@ def find_config_file(options, args, config_file='quantum.conf'):
root = os.path.join(dir_to_common, '..', '..', '..', '..') root = os.path.join(dir_to_common, '..', '..', '..', '..')
# Handle standard directory search for the config file # Handle standard directory search for the config file
config_file_dirs = [fix_path(os.path.join(os.getcwd(), 'etc')), config_file_dirs = [fix_path(os.path.join(os.getcwd(), 'etc')),
fix_path(os.path.join('~', '.quantum-venv', 'etc', fix_path(os.path.join('~', '.venv', 'etc',
'quantum')), 'quantum')),
fix_path('~'), fix_path('~'),
os.path.join(FLAGS.state_path, 'etc'), os.path.join(FLAGS.state_path, 'etc'),

View File

@ -34,7 +34,7 @@ function process_option {
esac esac
} }
venv=.quantum-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

View File

@ -29,7 +29,7 @@ import sys
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, '.quantum-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])
@ -110,7 +110,7 @@ def print_help():
To activate the Quantum virtualenv for the extent of your current shell To activate the Quantum virtualenv for the extent of your current shell
session you can run: session you can run:
$ source .quantum-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:

View File

@ -17,5 +17,5 @@
# under the License. # under the License.
TOOLS=`dirname $0` TOOLS=`dirname $0`
VENV=$TOOLS/../.quantum-venv VENV=$TOOLS/../.venv
source $VENV/bin/activate && $@ source $VENV/bin/activate && $@