From 819b48fd54893b27749f2ff45cdd12f01e93e27f Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Thu, 29 Sep 2022 09:18:43 +0200 Subject: [PATCH] Remove queue declaration and fix docs jobs This commit combines the following changes: * Remove lingering queue declaration from .zuul.yaml file. https://review.opendev.org/859777 (master) Co-authored-by: Matthias Runge * Replace oslo_utils.fnmatch with fnmatch The oslo_utils.fnmatch module was added to solve an issue in py2.7 but it is no longer required because py2.7 is no longer supported. The module was deprecated since oslo.utils 4.9.1[1] and the stdlib's fnmatch module should be used instead. https://review.opendev.org/799654 (master) https://review.opendev.org/852644 (stable/wallaby) Co-authored-by: Takashi Kajinami [1] 4c893c92f551c9dd2a7cfbe7ae8171ad8139df0b Change-Id: I9b34ac062d45b2b839dc9d6e0cdce696185890e4 (cherry picked from commit 7e545b0fd9fd4a393d9e2af30f9fc370b20078c0) (cherry picked from commit 142cb0b6e6f6fa85634c5176c84ab15d6511fa89) --- .zuul.yaml | 1 - ceilometer/agent.py | 2 +- ceilometer/event/converter.py | 3 ++- ceilometer/publisher/gnocchi.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 401f894acf..2fba6d0ecb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -45,7 +45,6 @@ - telemetry-dsvm-integration-ipv6-only: irrelevant-files: *ceilometer-irrelevant-files gate: - queue: telemetry jobs: - grenade-ceilometer - telemetry-dsvm-integration-centos-8s: diff --git a/ceilometer/agent.py b/ceilometer/agent.py index 32423ed3ce..48e42b97bf 100644 --- a/ceilometer/agent.py +++ b/ceilometer/agent.py @@ -13,11 +13,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +import fnmatch import os import pkg_resources from oslo_log import log -from oslo_utils import fnmatch import yaml LOG = log.getLogger(__name__) diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index c018f651c5..c33a90e659 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +import fnmatch + from oslo_config import cfg from oslo_log import log -from oslo_utils import fnmatch from oslo_utils import timeutils import pkg_resources diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index 9ff4204678..19d7d54b8c 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/ceilometer/publisher/gnocchi.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. from collections import defaultdict +import fnmatch import hashlib import itertools import json @@ -24,7 +25,6 @@ import uuid from gnocchiclient import exceptions as gnocchi_exc from keystoneauth1 import exceptions as ka_exceptions from oslo_log import log -from oslo_utils import fnmatch from oslo_utils import timeutils from stevedore import extension from urllib import parse as urlparse