From 8a9fc330cf9bec52acfa44e6e9955581e5189a79 Mon Sep 17 00:00:00 2001 From: MehrazRumman Date: Mon, 6 Jan 2025 18:25:31 +0600 Subject: [PATCH 1/4] unit test fixed --- requirements/extras/gcpubsub.txt | 4 ++-- t/unit/transport/test_gcpubsub.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements/extras/gcpubsub.txt b/requirements/extras/gcpubsub.txt index 8221bb0c6..121204781 100644 --- a/requirements/extras/gcpubsub.txt +++ b/requirements/extras/gcpubsub.txt @@ -1,4 +1,4 @@ google-cloud-pubsub>=2.18.4 google-cloud-monitoring>=2.16.0 -grpcio==1.67.0 -protobuf==4.25.5 +grpcio==1.68.1 +protobuf==5.29.2 diff --git a/t/unit/transport/test_gcpubsub.py b/t/unit/transport/test_gcpubsub.py index c617a329e..6ebcce543 100644 --- a/t/unit/transport/test_gcpubsub.py +++ b/t/unit/transport/test_gcpubsub.py @@ -285,12 +285,13 @@ def test_create_subscription(self, channel): channel.subscriber.create_subscription.assert_called_once() def test_create_subscription_protobuf_compat(self): + from datetime import timedelta request = { 'name': 'projects/my_project/subscriptions/kombu-1111-2222', 'topic': 'projects/jether-fox/topics/reply.celery.pidbox', 'ack_deadline_seconds': 240, - 'expiration_policy': {'ttl': '86400s'}, - 'message_retention_duration': '86400s', + 'expiration_policy': {'ttl': timedelta(seconds=86400)}, + 'message_retention_duration': timedelta(seconds=86400), 'filter': 'attributes.routing_key="1111-2222"', } Subscription(request) From 59dfc969b54907df35719e94d53e9cd03095599c Mon Sep 17 00:00:00 2001 From: MehrazRumman Date: Wed, 8 Jan 2025 22:31:39 +0600 Subject: [PATCH 2/4] github workflows updated --- .github/workflows/python-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 4d3bb1c54..e7cca8aa2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -85,13 +85,13 @@ jobs: include: - python-version: pypy3.10 toxenv: 'py-amqp' - experimental: true + experimental: false - python-version: pypy3.10 toxenv: 'py-redis' - experimental: true + experimental: false - python-version: pypy3.10 toxenv: 'py-mongodb' - experimental: true + experimental: false # - python-version: pypy3.10 # toxenv: 'py-kafka' # experimental: true From e374faf96fb96890b99fc62a924a574667713441 Mon Sep 17 00:00:00 2001 From: MehrazRumman Date: Wed, 8 Jan 2025 22:39:25 +0600 Subject: [PATCH 3/4] pypy 3.10 excluded from github workflow --- .github/workflows/python-package.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e7cca8aa2..093b6d993 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -82,19 +82,7 @@ jobs: 'py-kafka' ] experimental: [false] - include: - - python-version: pypy3.10 - toxenv: 'py-amqp' - experimental: false - - python-version: pypy3.10 - toxenv: 'py-redis' - experimental: false - - python-version: pypy3.10 - toxenv: 'py-mongodb' - experimental: false - # - python-version: pypy3.10 - # toxenv: 'py-kafka' - # experimental: true + steps: - name: Install apt packages From bf67ea417b2f372679a82b29ad739851f4fd546a Mon Sep 17 00:00:00 2001 From: MehrazRumman Date: Wed, 8 Jan 2025 23:19:51 +0600 Subject: [PATCH 4/4] pypy3.10 included --- .github/workflows/python-package.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 093b6d993..e7cca8aa2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -82,7 +82,19 @@ jobs: 'py-kafka' ] experimental: [false] - + include: + - python-version: pypy3.10 + toxenv: 'py-amqp' + experimental: false + - python-version: pypy3.10 + toxenv: 'py-redis' + experimental: false + - python-version: pypy3.10 + toxenv: 'py-mongodb' + experimental: false + # - python-version: pypy3.10 + # toxenv: 'py-kafka' + # experimental: true steps: - name: Install apt packages