diff --git a/Replace_deprecated_import_ABCs_from_collections.patch b/Replace_deprecated_import_ABCs_from_collections.patch new file mode 100644 index 0000000000000000000000000000000000000000..7ed0de113e32fa40666a22a490e1ad985deb432d --- /dev/null +++ b/Replace_deprecated_import_ABCs_from_collections.patch @@ -0,0 +1,22 @@ +diff --git a/zaqar/tests/unit/storage/base.py b/zaqar/tests/unit/storage/base.py +index 80e001c..5923c95 100644 +--- a/zaqar/tests/unit/storage/base.py ++++ b/zaqar/tests/unit/storage/base.py +@@ -14,7 +14,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-import collections ++from collections import abc + import datetime + import hashlib + import json +@@ -832,7 +832,7 @@ class MessageControllerTest(ControllerBaseTest): + res = self.controller.bulk_get(queue_name, message_ids, + project=self.project) + +- self.assertIsInstance(res, collections.Iterable) ++ self.assertIsInstance(res, abc.Iterable) + self.assertEqual([], list(res)) + + diff --git a/openstack-zaqar.spec b/openstack-zaqar.spec index 2a8c069e5e375da1c827b5e3034ccab692517103..98ca979bc6d981d1bee5c620bf7fc0b6a9aa9e0b 100644 --- a/openstack-zaqar.spec +++ b/openstack-zaqar.spec @@ -11,7 +11,7 @@ Name: openstack-%{service} # Liberty semver reset # https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z Version: 12.0.0 -Release: 1 +Release: 2 Summary: Message queuing service for OpenStack License: ASL 2.0 @@ -22,6 +22,8 @@ Source1: %{service}-dist.conf Source10: %{name}.service Source11: %{name}.logrotate Source12: %{name}@.service + +Patch001: Replace_deprecated_import_ABCs_from_collections.patch BuildArch: noarch BuildRequires: openstack-macros @@ -108,7 +110,7 @@ Requires: %{name} = %{version}-%{release} This package contains the Zaqar test files. %prep -%autosetup -n %{service}-%{upstream_version} -S git +%autosetup -n %{service}-%{upstream_version} -S git -p1 # Remove the requirements file so that pbr hooks don't add it # to distutils requires_dist config @@ -225,6 +227,9 @@ exit 0 %{python3_sitelib}/%{service}/tests %changelog +* Sat May 25 2024 tzing_t - 12.0.0-2 +- Replace deprecated import ABCs from collections + * Mon Apr 17 2023 lixinyu - 12.0.0-1 - Init package zaqar of version 12.0.0