diff options
author | Mark McLoughlin <markmc@redhat.com> | 2013-02-15 22:30:16 +0000 |
---|---|---|
committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-19 21:16:32 -0800 |
commit | 706a1370056ffccc2c8811fc1ac0679944564ece (patch) | |
tree | 0b71139bbf282e7909b0df37a69a2aaa8f3e32d2 /tools | |
parent | d62205f316ad9490e1379e943972a007e071c688 (diff) | |
download | nova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.gz |
Use oslo-config-2013.1b4
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b4 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
Add dependency_links to setup.py so that oslo-config can be installed
from the tarball URL specified in pip-requires.
Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other
deps get installed with easy_install which can't install oslo-config
from the URL.
Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already
does for paste. It turns out imp.find_module() doesn't correct handle
namespace packages.
Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/conf/analyze_opts.py | 2 | ||||
-rw-r--r-- | tools/conf/extract_opts.py | 3 | ||||
-rwxr-xr-x | tools/hacking.py | 4 | ||||
-rw-r--r-- | tools/install_venv_common.py | 2 | ||||
-rw-r--r-- | tools/pip-requires | 1 | ||||
-rw-r--r-- | tools/test-requires | 1 | ||||
-rw-r--r-- | tools/xenserver/destroy_cached_images.py | 3 | ||||
-rwxr-xr-x | tools/xenserver/vm_vdi_cleaner.py | 3 |
8 files changed, 13 insertions, 6 deletions
diff --git a/tools/conf/analyze_opts.py b/tools/conf/analyze_opts.py index f78169a8ca..3088d6390e 100755 --- a/tools/conf/analyze_opts.py +++ b/tools/conf/analyze_opts.py @@ -26,7 +26,7 @@ import os import sys sys.path.append(os.getcwd()) -from nova.openstack.common import iniparser +from oslo.config import iniparser class PropertyCollecter(iniparser.BaseParser): diff --git a/tools/conf/extract_opts.py b/tools/conf/extract_opts.py index 4dde53335d..83d99dd19d 100644 --- a/tools/conf/extract_opts.py +++ b/tools/conf/extract_opts.py @@ -26,7 +26,8 @@ import socket import sys import textwrap -from nova.openstack.common import cfg +from oslo.config import cfg + from nova.openstack.common import importutils diff --git a/tools/hacking.py b/tools/hacking.py index 69a4d73993..051c2a33c7 100755 --- a/tools/hacking.py +++ b/tools/hacking.py @@ -48,7 +48,9 @@ logging.disable('LOG') IMPORT_EXCEPTIONS = ['sqlalchemy', 'migrate', 'nova.db.sqlalchemy.session', 'nova.openstack.common.log.logging', - 'nova.db.sqlalchemy.migration.versioning_api', 'paste'] + 'nova.db.sqlalchemy.migration.versioning_api'] +# imp.find_module() doesn't support namespace packages +IMPORT_EXCEPTIONS += ['oslo', 'paste'] # Paste is missing a __init__ in top level directory START_DOCSTRING_TRIPLE = ['u"""', 'r"""', '"""', "u'''", "r'''", "'''"] END_DOCSTRING_TRIPLE = ['"""', "'''"] diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 3d47b12b24..92230dac76 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -32,7 +32,7 @@ if os.path.exists(os.path.join(possible_topdir, "nova", sys.path.insert(0, possible_topdir) -from nova.openstack.common import cfg +from oslo.config import cfg class InstallVenv(object): diff --git a/tools/pip-requires b/tools/pip-requires index d7e48ff87b..bb4eb7119e 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -27,3 +27,4 @@ python-glanceclient>=0.5.0,<2 python-keystoneclient>=0.2.0 stevedore>=0.7 websockify +http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b4.tar.gz#egg=oslo-config diff --git a/tools/test-requires b/tools/test-requires index 49ee52809f..1318ecd9a4 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -9,6 +9,7 @@ mox==0.5.3 MySQL-python psycopg2 pep8==1.3.3 +pyflakes pylint==0.25.2 python-subunit sphinx>=1.1.2 diff --git a/tools/xenserver/destroy_cached_images.py b/tools/xenserver/destroy_cached_images.py index fa71c0a680..625c765c66 100644 --- a/tools/xenserver/destroy_cached_images.py +++ b/tools/xenserver/destroy_cached_images.py @@ -16,6 +16,8 @@ eventlet.monkey_patch() import os import sys +from oslo.config import cfg + # If ../nova/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), @@ -26,7 +28,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) from nova import config -from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils from nova.virt.xenapi import driver as xenapi_driver diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index c9dc0b53d1..a842282fa0 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -19,6 +19,8 @@ import doctest import os import sys + +from oslo.config import cfg import XenAPI @@ -30,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): from nova import context from nova import db from nova import exception -from nova.openstack.common import cfg from nova.openstack.common import timeutils from nova.virt import virtapi from nova.virt.xenapi import driver as xenapi_driver |