From e6f21d678fa7dc15235bb60667468a85c76b3267 Mon Sep 17 00:00:00 2001 From: Bolehu Date: Fri, 6 Jan 2023 14:55:12 +0800 Subject: [PATCH 1/3] Fixes missing await in consumer.wait_empty Signed-off-by: Bolehu --- ...missing-await-in-consumer.wait_empty.patch | 25 +++++++++++++++++++ python-faust.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 backport-Fixes-missing-await-in-consumer.wait_empty.patch diff --git a/backport-Fixes-missing-await-in-consumer.wait_empty.patch b/backport-Fixes-missing-await-in-consumer.wait_empty.patch new file mode 100644 index 0000000..5c5e171 --- /dev/null +++ b/backport-Fixes-missing-await-in-consumer.wait_empty.patch @@ -0,0 +1,25 @@ +From 2a9cb8970b051e2536958bf7690b9cdaa22e3b55 Mon Sep 17 00:00:00 2001 +From: Ask Solem +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 + diff --git a/python-faust.spec b/python-faust.spec index 6926844..e797d90 100644 --- a/python-faust.spec +++ b/python-faust.spec @@ -1,11 +1,14 @@ %global _empty_manifest_terminate_build 0 Name: python-faust Version: 1.3.0 -Release: 2 +Release: 3 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 + BuildArch: noarch BuildRequires: python3 BuildRequires: python3-aiohttp @@ -77,6 +80,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Sat Jan 7 2023 Bolehu - 1.3.0-3 +- Fixes missing await in consumer.wait_empty + * Fri Aug 27 2021 wutao - 1.3.0-2 - Change faust.tar.gz source from github to pypi to compatible with openEuler From f3a8ce3c73e07a9ac01798924fd6a19477b9453d Mon Sep 17 00:00:00 2001 From: Bolehu Date: Fri, 6 Jan 2023 22:32:37 +0800 Subject: [PATCH 2/3] loghandlers is list of Handler not StreamHandler Signed-off-by: Bolehu --- ...is-list-of-Handler-not-StreamHandler.patch | 34 +++++++++++++++++++ python-faust.spec | 6 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 backport-loghandlers-is-list-of-Handler-not-StreamHandler.patch diff --git a/backport-loghandlers-is-list-of-Handler-not-StreamHandler.patch b/backport-loghandlers-is-list-of-Handler-not-StreamHandler.patch new file mode 100644 index 0000000..6d52ed0 --- /dev/null +++ b/backport-loghandlers-is-list-of-Handler-not-StreamHandler.patch @@ -0,0 +1,34 @@ +From 12ebcf87c858ede721572a6db3fe63bb3addddbf Mon Sep 17 00:00:00 2001 +From: Ask Solem +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 + diff --git a/python-faust.spec b/python-faust.spec index e797d90..47d8534 100644 --- a/python-faust.spec +++ b/python-faust.spec @@ -1,13 +1,14 @@ %global _empty_manifest_terminate_build 0 Name: python-faust Version: 1.3.0 -Release: 3 +Release: 4 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 BuildArch: noarch BuildRequires: python3 @@ -80,6 +81,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Mon Jan 9 2023 Bolehu - 1.3.0-4 +- loghandlers is list of Handler not StreamHandler + * Sat Jan 7 2023 Bolehu - 1.3.0-3 - Fixes missing await in consumer.wait_empty From 36697dd9f4ecbcaee32f6fc21b55e59e9c48fc0c Mon Sep 17 00:00:00 2001 From: Bolehu Date: Sat, 7 Jan 2023 01:29:07 +0800 Subject: [PATCH 3/3] Fixes test issue after table serializer choice pull req Signed-off-by: Bolehu --- ...-after-table-serializer-choice-pull-.patch | 25 +++++++++++++++++++ python-faust.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 backport-Fixes-test-issue-after-table-serializer-choice-pull-.patch diff --git a/backport-Fixes-test-issue-after-table-serializer-choice-pull-.patch b/backport-Fixes-test-issue-after-table-serializer-choice-pull-.patch new file mode 100644 index 0000000..9d7f7eb --- /dev/null +++ b/backport-Fixes-test-issue-after-table-serializer-choice-pull-.patch @@ -0,0 +1,25 @@ +From f0bc203c52b417bf815ac2b0dffbd1f2cd744a8f Mon Sep 17 00:00:00 2001 +From: Ask Solem +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 + diff --git a/python-faust.spec b/python-faust.spec index 47d8534..d432bdd 100644 --- a/python-faust.spec +++ b/python-faust.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-faust Version: 1.3.0 -Release: 4 +Release: 5 Summary: Python Stream processing. License: BSD 3-Clause and CC-BY-SA-4.0 URL: http://faust.readthedocs.io/ @@ -9,6 +9,7 @@ Source0: https://files.pythonhosted.org/packages/91/c3/75878084aba2bbcf680b0c57f 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 @@ -81,6 +82,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Mon Jan 9 2023 Bolehu - 1.3.0-5 +- Fixes test issue after table serializer choice pull req + * Mon Jan 9 2023 Bolehu - 1.3.0-4 - loghandlers is list of Handler not StreamHandler