Migrate from ujson to simplejson
Additionally, temporarily set build-monasca-docker-image as non-voting due to problems with buggy confluent-kafka 1.4.0 release, which prevents building the Docker image. Change-Id: I561ea633a09eb3d7468d2d55aa46d6fb3b2380ff Story: 2007549 Task: 39390
This commit is contained in:
parent
76f86ec612
commit
db01fe425b
12
.zuul.yaml
12
.zuul.yaml
@ -7,18 +7,10 @@
|
||||
- release-notes-jobs-python3
|
||||
check:
|
||||
jobs:
|
||||
- build-monasca-docker-image
|
||||
- build-monasca-docker-image:
|
||||
voting: false
|
||||
- monasca-tempest-python3-influxdb:
|
||||
voting: false
|
||||
post:
|
||||
jobs:
|
||||
- publish-monasca-notification-docker-image
|
||||
periodic:
|
||||
jobs:
|
||||
- publish-monasca-notification-docker-image
|
||||
release:
|
||||
jobs:
|
||||
- publish-monasca-notification-docker-image
|
||||
|
||||
- job:
|
||||
name: publish-monasca-notification-docker-image
|
||||
|
@ -56,6 +56,7 @@ PyYAML==3.12
|
||||
requests==2.14.2
|
||||
requestsexceptions==1.2.0
|
||||
rfc3986==0.3.1
|
||||
simplejson==3.8.1
|
||||
six==1.10.0
|
||||
smmap==0.9.0
|
||||
sphinx==1.6.2
|
||||
|
@ -15,7 +15,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
import requests
|
||||
import ujson as json
|
||||
import simplejson as json
|
||||
|
||||
from debtcollector import removals
|
||||
from oslo_config import cfg
|
||||
|
@ -14,14 +14,13 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from debtcollector import removals
|
||||
from jinja2 import Template
|
||||
import jira
|
||||
from six.moves import urllib
|
||||
import ujson as json
|
||||
import yaml
|
||||
|
||||
from debtcollector import removals
|
||||
from oslo_config import cfg
|
||||
import simplejson as json
|
||||
from six.moves import urllib
|
||||
import yaml
|
||||
|
||||
from monasca_notification.plugins.abstract_notifier import AbstractNotifier
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
import requests
|
||||
import ujson as json
|
||||
import simplejson as json
|
||||
|
||||
from debtcollector import removals
|
||||
from oslo_config import cfg
|
||||
|
@ -15,13 +15,13 @@
|
||||
# limitations under the License.
|
||||
|
||||
import os
|
||||
import requests
|
||||
from six.moves import urllib
|
||||
import ujson as json
|
||||
|
||||
from debtcollector import removals
|
||||
import jinja2
|
||||
from oslo_config import cfg
|
||||
import requests
|
||||
import simplejson as json
|
||||
from six.moves import urllib
|
||||
|
||||
from monasca_notification.plugins import abstract_notifier
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
import requests
|
||||
import ujson as json
|
||||
import simplejson as json
|
||||
|
||||
from debtcollector import removals
|
||||
from oslo_config import cfg
|
||||
|
@ -17,8 +17,8 @@ import time
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
import simplejson as json
|
||||
import six
|
||||
import ujson as json
|
||||
|
||||
from monasca_notification.common.repositories import exceptions as exc
|
||||
from monasca_notification.common.utils import get_db_repo
|
||||
|
@ -13,3 +13,4 @@ oslo.config>=5.2.0 # Apache-2.0
|
||||
oslo.log>=3.36.0 # Apache-2.0
|
||||
oslo.serialization>=2.18.0 # Apache-2.0
|
||||
jira>=1.0.3 # BSD License (2 clause)
|
||||
simplejson>=3.8.1
|
||||
|
@ -17,8 +17,8 @@
|
||||
import mock
|
||||
import requests
|
||||
|
||||
import simplejson as json
|
||||
import six
|
||||
import ujson as json
|
||||
|
||||
from monasca_notification import notification as m_notification
|
||||
from monasca_notification.plugins import webhook_notifier
|
||||
|
Loading…
x
Reference in New Issue
Block a user