diff options
| author | Akihiro Motoki <motoki@da.jp.nec.com> | 2014-03-24 02:55:20 +0900 |
|---|---|---|
| committer | Akihiro Motoki <motoki@da.jp.nec.com> | 2014-04-05 23:36:07 +0900 |
| commit | 21b7822f9b73e8ec4ce200493cf819495b677735 (patch) | |
| tree | 4160bd64438b11c27782bc92ef82a197710622a3 /tools | |
| parent | 830c2b62c807e24e228d1ecda71c3c8dcc7aa88c (diff) | |
| download | horizon-21b7822f9b73e8ec4ce200493cf819495b677735.tar.gz | |
Sync latest Oslo
Sync from oslo-incubator commit 46f2b697b6aacc674bc040a8751997ed70490d1a
Major changes of the import are related to update policy module:
0da5de6b54 Allow policy.json resource vs constant check
5d1f15a778 Documenting policy.json syntax
33533b0d97 Keystone user can't perform revoke_token
Most changes are style-related topics:
* Improve Python3 compatibility
* Remove vim modelines
* Support Per-log-level logging translations
Closes-Bug: #1296337
Change-Id: I09f61b10b1b36015d248de25c5c6ed994717a565
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 10 | ||||
| -rw-r--r-- | tools/install_venv_common.py | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 8ef3749c9..e96521ea2 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. @@ -27,12 +25,12 @@ import install_venv_common as install_venv # noqa def print_help(venv, root): help = """ - Openstack development environment setup is complete. + OpenStack development environment setup is complete. - Openstack development uses virtualenv to track and manage Python + OpenStack development uses virtualenv to track and manage Python dependencies while in development and testing. - To activate the Openstack virtualenv for the extent of your current shell + To activate the OpenStack virtualenv for the extent of your current shell session you can run: $ source %s/bin/activate @@ -59,7 +57,7 @@ def main(argv): pip_requires = os.path.join(root, 'requirements.txt') test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'Openstack' + project = 'OpenStack' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, py_version, project) options = install.parse_args(argv) diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 1bab88a3f..46822e329 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 IBM Corp. # |