!33 fix 2203 sp3 to 2403
From: @yueyaoqiang Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
6580150c07
25
backport-Fixes-missing-await-in-consumer.wait_empty.patch
Normal file
25
backport-Fixes-missing-await-in-consumer.wait_empty.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 2a9cb8970b051e2536958bf7690b9cdaa22e3b55 Mon Sep 17 00:00:00 2001
|
||||
From: Ask Solem <asksol@robinhood.com>
|
||||
Date: Mon, 19 Nov 2018 13:00:47 -0800
|
||||
Subject: [PATCH] Fixes missing `await` in consumer.wait_empty
|
||||
|
||||
---
|
||||
faust/transport/consumer.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/faust/transport/consumer.py b/faust/transport/consumer.py
|
||||
index 17e60fab..873356d8 100644
|
||||
--- a/faust/transport/consumer.py
|
||||
+++ b/faust/transport/consumer.py
|
||||
@@ -300,7 +300,7 @@ class Consumer(Service, ConsumerT):
|
||||
self._waiting_for_ack = asyncio.Future(loop=self.loop)
|
||||
try:
|
||||
# wait for `ack()` to wake us up
|
||||
- asyncio.wait_for(
|
||||
+ await asyncio.wait_for(
|
||||
self._waiting_for_ack, loop=self.loop, timeout=1)
|
||||
except (asyncio.TimeoutError,
|
||||
asyncio.CancelledError): # pragma: no cover
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From f0bc203c52b417bf815ac2b0dffbd1f2cd744a8f Mon Sep 17 00:00:00 2001
|
||||
From: Ask Solem <asksol@robinhood.com>
|
||||
Date: Mon, 26 Nov 2018 10:26:04 -0800
|
||||
Subject: [PATCH] Fixes test issue after table serializer choice pull req
|
||||
|
||||
---
|
||||
t/unit/stores/test_base.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/t/unit/stores/test_base.py b/t/unit/stores/test_base.py
|
||||
index 0c663718..39cdb072 100644
|
||||
--- a/t/unit/stores/test_base.py
|
||||
+++ b/t/unit/stores/test_base.py
|
||||
@@ -125,6 +125,8 @@ class test_SerializedStore:
|
||||
url='foo://',
|
||||
app=app,
|
||||
table=Mock(name='table'),
|
||||
+ key_serializer='json',
|
||||
+ value_serializer='json',
|
||||
)
|
||||
|
||||
def test_apply_changelog_batch(self, *, store):
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
From 12ebcf87c858ede721572a6db3fe63bb3addddbf Mon Sep 17 00:00:00 2001
|
||||
From: Ask Solem <asksol@robinhood.com>
|
||||
Date: Fri, 16 Nov 2018 09:52:22 -0800
|
||||
Subject: [PATCH] loghandlers is list of Handler not StreamHandler
|
||||
|
||||
---
|
||||
faust/types/settings.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/faust/types/settings.py b/faust/types/settings.py
|
||||
index fc2e15e1..0fb0aff8 100644
|
||||
--- a/faust/types/settings.py
|
||||
+++ b/faust/types/settings.py
|
||||
@@ -265,7 +265,7 @@ class Settings(abc.ABC):
|
||||
table_standby_replicas: int = 1
|
||||
topic_replication_factor: int = 1
|
||||
topic_partitions: int = 8 # noqa: E704
|
||||
- loghandlers: List[logging.StreamHandler]
|
||||
+ loghandlers: List[logging.Handler]
|
||||
producer_linger_ms: int = PRODUCER_LINGER_MS
|
||||
producer_max_batch_size: int = PRODUCER_MAX_BATCH_SIZE
|
||||
producer_acks: int = PRODUCER_ACKS
|
||||
@@ -366,7 +366,7 @@ class Settings(abc.ABC):
|
||||
tabledir: Union[Path, str] = None,
|
||||
key_serializer: CodecArg = None,
|
||||
value_serializer: CodecArg = None,
|
||||
- loghandlers: List[logging.StreamHandler] = None,
|
||||
+ loghandlers: List[logging.Handler] = None,
|
||||
table_cleanup_interval: Seconds = None,
|
||||
table_standby_replicas: int = None,
|
||||
topic_replication_factor: int = None,
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
%global _empty_manifest_terminate_build 0
|
||||
Name: python-faust
|
||||
Version: 1.3.0
|
||||
Release: 2
|
||||
Release: 5
|
||||
Summary: Python Stream processing.
|
||||
License: BSD 3-Clause and CC-BY-SA-4.0
|
||||
URL: http://faust.readthedocs.io/
|
||||
Source0: https://files.pythonhosted.org/packages/91/c3/75878084aba2bbcf680b0c57f00b9586b0b9d84a74695260b489666e579b/faust-1.3.0.tar.gz
|
||||
|
||||
Patch0001: backport-Fixes-missing-await-in-consumer.wait_empty.patch
|
||||
Patch0002: backport-loghandlers-is-list-of-Handler-not-StreamHandler.patch
|
||||
Patch0003: backport-Fixes-test-issue-after-table-serializer-choice-pull-.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-aiohttp
|
||||
@ -77,6 +82,15 @@ mv %{buildroot}/doclist.lst .
|
||||
%{_docdir}/*
|
||||
|
||||
%changelog
|
||||
* Mon Jan 9 2023 Bolehu <heyaohua@xfusion.com> - 1.3.0-5
|
||||
- Fixes test issue after table serializer choice pull req
|
||||
|
||||
* Mon Jan 9 2023 Bolehu <heyaohua@xfusion.com> - 1.3.0-4
|
||||
- loghandlers is list of Handler not StreamHandler
|
||||
|
||||
* Sat Jan 7 2023 Bolehu <heyaohua@xfusion.com> - 1.3.0-3
|
||||
- Fixes missing await in consumer.wait_empty
|
||||
|
||||
* Fri Aug 27 2021 wutao <wutao61@huawei.com> - 1.3.0-2
|
||||
- Change faust.tar.gz source from github to pypi to
|
||||
compatible with openEuler
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user