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
This commit is contained in:
committed by
Vishvananda Ishaya
parent
4559adc2f6
commit
b7091b4d52
@@ -22,6 +22,7 @@
|
||||
import datetime
|
||||
import uuid as stdlib_uuid
|
||||
|
||||
from oslo.config import cfg
|
||||
from sqlalchemy import MetaData
|
||||
from sqlalchemy.schema import Table
|
||||
from sqlalchemy.sql.expression import select
|
||||
@@ -29,7 +30,6 @@ from sqlalchemy.sql.expression import select
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import cfg
|
||||
from nova.openstack.common.db.sqlalchemy import session as db_session
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import test
|
||||
|
||||
Reference in New Issue
Block a user