Skip to content

Commit

Permalink
Obsolete oslo-incubator modules - jsonutils (now oslo.serialization)
Browse files Browse the repository at this point in the history
This change is part of a multi-part change set to handle obsolete and
graduated oslo modules. This commit handles the jsonutils module which
is now oslo.serialization.jsonutils. The change here is to remove it
from openstack-common.conf and point all people who used to use that
at oslo.serialization. requirements.txt has been updated to point to
this dependency.

The file jsonutils.py is not being deleted because of dependencies in
oslo-incubator.

Change has been rebased on https://review.openstack.org/#/c/129294/

Change-Id: I2a7d4c41ce77d6375fa08033514baa815a087016
Partial-Bug: #1380789
blueprint: retire-unused-oslo-incubator-modules
  • Loading branch information
Amrith Kumar committed Dec 11, 2014
1 parent 0fec4bc commit a52f7cf
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion openstack-common.conf
Expand Up @@ -6,7 +6,6 @@ module=eventlet_backdoor
module=exception
module=fileutils
module=gettextutils
module=jsonutils
module=local
module=log
module=loopingcall
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Expand Up @@ -28,7 +28,8 @@ jsonschema>=2.0.0,<3.0.0
Jinja2>=2.6 # BSD License (3 clause)
pexpect>=3.1 # ISC License
oslo.config>=1.4.0 # Apache-2.0
oslo.utils>=1.1.0 # Apache-2.0
oslo.serialization>=1.0.0
oslo.utils>=1.1.0
MySQL-python
Babel>=1.3
six>=1.7.0
Expand Down
2 changes: 1 addition & 1 deletion trove/common/limits.py
Expand Up @@ -30,7 +30,7 @@

from trove.common import cfg
from trove.common import wsgi as base_wsgi
from trove.openstack.common import jsonutils
from oslo.serialization import jsonutils
from trove.openstack.common import wsgi
from trove.openstack.common.gettextutils import _

Expand Down
2 changes: 1 addition & 1 deletion trove/common/wsgi.py
Expand Up @@ -30,7 +30,7 @@
from trove.common import exception
from trove.common import utils
from trove.openstack.common.gettextutils import _
from trove.openstack.common import jsonutils
from oslo.serialization import jsonutils

from trove.openstack.common import pastedeploy
from trove.openstack.common import service
Expand Down
2 changes: 1 addition & 1 deletion trove/tests/unittests/api/common/test_limits.py
Expand Up @@ -29,7 +29,7 @@
from trove.common.limits import Limit
from trove.limits import views
from trove.limits.service import LimitsController
from trove.openstack.common import jsonutils
from oslo.serialization import jsonutils
from trove.quota.quota import QUOTAS

TEST_LIMITS = [
Expand Down

0 comments on commit a52f7cf

Please sign in to comment.