Drop use of 'oslo' namespace package

The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.

The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.

Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.

Blueprint: remove-namespace-packages
https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages

Change-Id: I05a408b76d4f31b803769a27759e91df770511bb
This commit is contained in:
Doug Hellmann 2015-06-18 22:22:37 +00:00
parent a3a3c3faa8
commit 3b6ca5b6de
10 changed files with 11 additions and 11 deletions

@ -23,14 +23,14 @@ import kombu
from oslotest import mockpatch from oslotest import mockpatch
import testscenarios import testscenarios
from oslo.config import cfg
from oslo import messaging from oslo import messaging
from oslo.serialization import jsonutils from oslo_config import cfg
from oslo_messaging._drivers import amqp from oslo_messaging._drivers import amqp
from oslo_messaging._drivers import amqpdriver from oslo_messaging._drivers import amqpdriver
from oslo_messaging._drivers import common as driver_common from oslo_messaging._drivers import common as driver_common
from oslo_messaging._drivers import impl_rabbit as rabbit_driver from oslo_messaging._drivers import impl_rabbit as rabbit_driver
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_serialization import jsonutils
from six.moves import mock from six.moves import mock
load_tests = testscenarios.load_tests_apply_scenarios load_tests = testscenarios.load_tests_apply_scenarios

@ -27,8 +27,8 @@ except ImportError:
zmq = None zmq = None
from oslo import messaging from oslo import messaging
from oslo.utils import importutils
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_utils import importutils
# eventlet is not yet py3 compatible, so skip if not installed # eventlet is not yet py3 compatible, so skip if not installed
eventlet = importutils.try_import('eventlet') eventlet = importutils.try_import('eventlet')

@ -14,8 +14,8 @@
import testtools import testtools
from oslo.utils import importutils
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_utils import importutils
# NOTE(jamespage) matchmaker tied directly to eventlet # NOTE(jamespage) matchmaker tied directly to eventlet
# which is not yet py3 compatible - skip if import fails # which is not yet py3 compatible - skip if import fails

@ -14,8 +14,8 @@
import testtools import testtools
from oslo.utils import importutils
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_utils import importutils
redis = importutils.try_import('redis') redis = importutils.try_import('redis')
matchmaker_redis = ( matchmaker_redis = (

@ -14,8 +14,8 @@
import testtools import testtools
from oslo.utils import importutils
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_utils import importutils
# NOTE(jamespage) matchmaker tied directly to eventlet # NOTE(jamespage) matchmaker tied directly to eventlet
# which is not yet py3 compatible - skip if import fails # which is not yet py3 compatible - skip if import fails

@ -18,9 +18,9 @@ import time
import testscenarios import testscenarios
from oslo.config import cfg
from oslo import messaging from oslo import messaging
from oslo.messaging.notify import dispatcher from oslo.messaging.notify import dispatcher
from oslo_config import cfg
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from six.moves import mock from six.moves import mock

@ -15,10 +15,10 @@
import testscenarios import testscenarios
from oslo.config import cfg
from oslo import messaging from oslo import messaging
from oslo.messaging import exceptions from oslo.messaging import exceptions
from oslo.messaging import serializer as msg_serializer from oslo.messaging import serializer as msg_serializer
from oslo_config import cfg
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
load_tests = testscenarios.load_tests_apply_scenarios load_tests = testscenarios.load_tests_apply_scenarios

@ -17,8 +17,8 @@ import threading
import testscenarios import testscenarios
from oslo.config import cfg
from oslo import messaging from oslo import messaging
from oslo_config import cfg
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from six.moves import mock from six.moves import mock

@ -19,9 +19,9 @@ import six
import testscenarios import testscenarios
from oslo import messaging from oslo import messaging
from oslo.serialization import jsonutils
from oslo_messaging._drivers import common as exceptions from oslo_messaging._drivers import common as exceptions
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_serialization import jsonutils
load_tests = testscenarios.load_tests_apply_scenarios load_tests = testscenarios.load_tests_apply_scenarios

@ -19,9 +19,9 @@ import six
from stevedore import driver from stevedore import driver
import testscenarios import testscenarios
from oslo.config import cfg
from oslo import messaging from oslo import messaging
from oslo.messaging import transport from oslo.messaging import transport
from oslo_config import cfg
from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests import utils as test_utils
from oslo_messaging import transport as private_transport from oslo_messaging import transport as private_transport