Merge branch 'main' into patch-2

Author: auvipy

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.5.0rc2
+current_version = 5.5.3
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<releaselevel>[a-z]+)?

.github/workflows/python-package.yml

@@ -59,6 +59,12 @@ jobs:
           tox --verbose --verbose -e
           "${{ matrix.python-version }}-unit" -vv
 
+    - name: Upload test results to Codecov
+      if: ${{ !cancelled() }} # Run even if tests fail
+      uses: codecov/test-results-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+
     - uses: codecov/codecov-action@v5
       with:
         fail_ci_if_error: false # optional (default = false)

AUTHORS

@@ -60,6 +60,7 @@ Gregory Haskins <[email protected]>
 Hank John <[email protected]>
 haridsv
 Hong Minhee <[email protected]>
+Hunter Fernandes <[email protected]>
 Ian Eure <[email protected]>
 Ian Struble <[email protected]>
 Ionel Maries Cristian <[email protected]>

Changelog.rst

@@ -4,6 +4,191 @@
  Change history
 ================
 
+.. _version-5.5.3:
+
+5.5.3
+=====
+:release-date: 16 Apr, 2025
+:release-by: Tomer Nosrati
+
+What's Changed
+~~~~~~~~~~~~~~
+
+- Fix error of double normalization options from URI in mongodb transport (#2282)
+- Move use of typing_extensions into TYPE_CHECKING block (#2283)
+- Do not pin package tzdata anymore (#2274)
+- Typo in pools's documentation (#2285)
+- Prepare for release: v5.5.3 (#2288)
+
+.. _version-5.5.2:
+
+5.5.2
+=====
+:release-date: 31 Mar, 2025
+:release-by: Tomer Nosrati
+
+What's Changed
+~~~~~~~~~~~~~~
+
+- Bump tzdata from 2025.1 to 2025.2 (#2268)
+- Downgrad kafka version to make the CI green again (#2271)
+- Attempt to fix retry loop in `maybe_declare()` when broken connection (#2275)
+- Prepare for release: v5.5.2 (#2278)
+
+.. _version-5.5.1:
+
+5.5.1
+=====
+:release-date: 24 Mar, 2025
+:release-by: Tomer Nosrati
+
+What's Changed
+~~~~~~~~~~~~~~
+
+- Update trove classifier with missing python 3.13 (#2262)
+- Fix native_delayed_delivery for queue with explicit bindings (#2263)
+- SQS: Fix Query Protocol Content-Type header (#2266)
+- SQS: More Protocol Tests (#2267)
+- Prepare for release: v5.5.1 (#2270)
+
+.. _version-5.5.0:
+
+5.5.0
+=====
+:release-date: 13 Mar, 2025
+:release-by: Tomer Nosrati
+
+Key Highlights
+~~~~~~~~~~~~~~
+
+Native Delayed Delivery
+-----------------------
+
+Official support to `RabbitMQ Delayed Delivery <https://docs.particular.net/transports/rabbitmq/delayed-delivery>`_,
+which is required to enable ETA tasks with quorum queues in Celery.
+
+urllib3 instead of curl
+-----------------------
+
+We can finally say goodbye to the :pypi:`pycurl` dependency and use :pypi:`urllib3` instead.
+
+Transport: Google Pub/Sub
+-------------------------
+
+New support for Google Pub/Sub as a transport broker.
+
+What's Changed
+~~~~~~~~~~~~~~
+
+- Pin tzdata to latest version 2024.2 (#2121)
+- Refactored CI (#2122)
+- Added unit tests to "tox -e parallel" environment (#2123)
+- Improve pre-commit checks and fix all new lint errors (#2124)
+- Removed codecov flags (#2126)
+- Pin pre-commit to latest version 3.8.0 (#2125)
+- Limit redis-py <5.1.0 (#2132)
+- Removed "on push" from the linter GitHub Actions workflow (#2133)
+- Bump pymongo from 4.9.1 to 4.10.0 (#2130)
+- Update pymongo to 4.10.1 (#2136)
+- fix(pytest): skip file-lock test on Windows (#2138)
+- Apply errback and callback when retry occurs (#2129)
+- Pin pre-commit to latest version 4.0.0 (Python 3.9+) (#2140)
+- Pin pre-commit to latest version 4.0.1 (#2144)
+- Add native delayed delivery API to kombu (#2128)
+- Add support for Google Pub/Sub as transport broker (#2147)
+- Update the transport options according to the retry policy (#2148)
+- Feature: urllib3 instead of curl (#2134)
+- Update mypy to 1.12.0 (#2149)
+- Prepare for (pre) release: v5.5.0rc1 (#2150)
+- Added missing changelog highlight for Google Pub/Sub (#2151)
+- Bump grpcio from 1.66.2 to 1.67.0 (#2158)
+- Fix: restrict google-cloud-pubsub version (#2160)
+- Update mypy to 1.12.1 (#2164)
+- Added a unit test that proves timeout is used when retry policy is specified (#2166)
+- Fix regression from #2148 (#2165)
+- Update google-cloud-pubsub requirement from <=2.20.3,>=2.18.4 to >=2.18.4,<=2.25.2 (#2168)
+- Revert "Update google-cloud-pubsub requirement from <=2.20.3,>=2.18.4 to >=2.18.4,<=2.25.2" (#2169)
+- Update mypy to 1.13.0 (#2172)
+- Fix: restrict google protobuf version (#2175)
+- Add support for Python 3.13 (#2052)
+- Apply retry policy to maybe_declare() (#2174)
+- Pin redis to >=4.5.2,!=4.5.5,!=5.0.2,<=5.2.0 (#2178)
+- Added confirm_timeout argument to publish() (#2167)
+- Prepare for (pre) release: v5.5.0rc2 (#2181)
+- Bump pytest-cov from 5.0.0 to 6.0.0 (#2183)
+- Add documentation for debug logs environment variables (#2186)
+- Add documentation for py-amqp transport options (#2187)
+- Bump codecov/codecov-action from 4 to 5 (#2189)
+- Update pytest to 8.3.4 (#2196)
+- Update redis requirement from !=4.5.5,!=5.0.2,<=5.2.0,>=4.5.2 to >=4.5.2,!=4.5.5,!=5.0.2,<=5.2.1 (#2203)
+- Close connections in case of an exception (#2201)
+- Bump pytest-freezer from 0.4.8 to 0.4.9 (#2205)
+- Bump mypy from 1.13.0 to 1.14.0 (#2211)
+- fix(sqs): don't crash on multiple predefined queues with aws sts session (#2224)
+- Bump mypy from 1.14.0 to 1.14.1 (#2215)
+- Bump tzdata from 2024.2 to 2025.1 (#2230)
+- fix: interpret the ssl_check_hostname as a boolean (#2229)
+- Revert "Resolving TypeError, during version unpacking " (#2225)
+- Bump flake8 from 7.1.1 to 7.1.2 (#2244)
+- Prepare for (pre) release: v5.5.0rc3 (#2247)
+- Bump pytest from 8.3.4 to 8.3.5 (#2253)
+- Update delayed_infra example for better clarity (#2252)
+- SQS: Support Async JSON SQS Protocol & Message Attributes (#2226)
+- Prepare for release: v5.5.0 (#2255)
+
+Changes since 5.5.0rc3
+----------------------
+
+- Bump pytest from 8.3.4 to 8.3.5 (#2253)
+- Update delayed_infra example for better clarity (#2252)
+- SQS: Support Async JSON SQS Protocol & Message Attributes (#2226)
+
+.. _version-5.5.0rc3:
+
+5.5.0rc3
+========
+:release-date: 20 Feb, 2025
+:release-by: Tomer Nosrati
+
+Key Highlights
+~~~~~~~~~~~~~~
+
+Native Delayed Delivery
+-----------------------
+
+Official support to `RabbitMQ Delayed Delivery <https://docs.particular.net/transports/rabbitmq/delayed-delivery>`_,
+which is required to enable ETA tasks with quorum queues in Celery.
+
+urllib3 instead of curl
+-----------------------
+
+We can finally say goodbye to the :pypi:`pycurl` dependency and use :pypi:`urllib3` instead.
+
+Transport: Google Pub/Sub
+-------------------------
+
+New support for Google Pub/Sub as a transport broker.
+
+What's Changed
+~~~~~~~~~~~~~~
+
+- Bump pytest-cov from 5.0.0 to 6.0.0 (#2183)
+- Add documentation for debug logs environment variables (#2186)
+- Add documentation for py-amqp transport options (#2187)
+- Bump codecov/codecov-action from 4 to 5 (#2189)
+- Update pytest to 8.3.4 (#2196)
+- Update redis requirement from !=4.5.5,!=5.0.2,<=5.2.0,>=4.5.2 to >=4.5.2,!=4.5.5,!=5.0.2,<=5.2.1 (#2203)
+- Close connections in case of an exception (#2201)
+- Bump pytest-freezer from 0.4.8 to 0.4.9 (#2205)
+- Bump mypy from 1.13.0 to 1.14.0 (#2211)
+- fix(sqs): don't crash on multiple predefined queues with aws sts session (#2224)
+- Bump mypy from 1.14.0 to 1.14.1 (#2215)
+- Bump tzdata from 2024.2 to 2025.1 (#2230)
+- fix: interpret the ssl_check_hostname as a boolean (#2229)
+- Revert "Resolving TypeError, during version unpacking " (#2225)
+- Bump flake8 from 7.1.1 to 7.1.2 (#2244)
+- Prepare for (pre) release: v5.5.0rc3 (#2247)
+
 .. _version-5.5.0rc2:
 
 5.5.0rc2

README.rst

@@ -4,10 +4,11 @@
 
 |build-status| |coverage| |license| |wheel| |pyversion| |pyimp| |downloads|
 
-:Version: 5.5.0rc2
+:Version: 5.5.3
 :Documentation: https://kombu.readthedocs.io/
 :Download: https://pypi.org/project/kombu/
 :Source: https://github.com/celery/kombu/
+:DeepWiki: |deepwiki|
 :Keywords: messaging, amqp, rabbitmq, redis, mongodb, python, queue
 
 About
@@ -350,9 +351,16 @@ file in the top distribution directory for the full license text.
 .. |pyimp| image:: https://img.shields.io/pypi/implementation/kombu.svg
      :alt: Support Python implementations.
      :target: https://pypi.org/project/kombu/
+
 .. |downloads| image:: https://pepy.tech/badge/kombu
     :target: https://pepy.tech/project/kombu
 
+.. |deepwiki| image:: https://devin.ai/assets/deepwiki-badge.png
+    :alt: Ask http://DeepWiki.com
+    :target: https://deepwiki.com/celery/kombu
+    :width: 125px
+
+
 kombu as part of the Tidelift Subscription
 =======
 

SECURITY.md

@@ -2,16 +2,15 @@
 
 ## Supported Versions
 
-
 | Version | Supported          |
 | ------- | ------------------ |
-| 5.2.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 5.1.x   | :white_check_mark: |
+| 5.5.x   | :white_check_mark: |
+| 5.4.x   | :x:                |
+| 5.3.x   | :x:                |
+| 5.2.x   | :x:                |
+| 5.1.x   | :x:                |
 | < 5.0   | :x:                |
 
 ## Reporting a Vulnerability
 
-Please report vulnerability issues directly to [email protected]
-
-
+Please reach out to [email protected] or [email protected] for reporting security concerns via email.

docs/includes/introduction.txt

@@ -1,4 +1,4 @@
-:Version: 5.5.0rc2
+:Version: 5.5.3
 :Web: https://kombu.readthedocs.io/
 :Download: https://pypi.org/project/kombu/
 :Source: https://github.com/celery/kombu/

docs/userguide/pools.rst

@@ -189,4 +189,4 @@ argument:
 
     from kombu import pools
 
-    connections = pools.Connections(limit=pools.use_default_limit)
+    connections = pools.Connections(limit=pools.use_global_limit)

examples/delayed_infra.py

@@ -1,22 +1,21 @@
 from __future__ import annotations
 
-from examples.experimental.async_consume import queue
 from kombu import Connection, Exchange, Queue
 from kombu.transport.native_delayed_delivery import (
     bind_queue_to_native_delayed_delivery_exchange, calculate_routing_key,
     declare_native_delayed_delivery_exchanges_and_queues, level_name)
 
 with Connection('amqp://guest:guest@localhost:5672//') as connection:
     declare_native_delayed_delivery_exchanges_and_queues(connection, 'quorum')
+    channel = connection.channel()
 
-    destination_exchange = Exchange(
-        'destination', type='topic')
-    destination_queue = Queue("destination", exchange=destination_exchange)
-    bind_queue_to_native_delayed_delivery_exchange(connection, queue)
+    destination_exchange = Exchange('destination_exchange', type='topic')
+    queue = Queue("destination", exchange=destination_exchange, routing_key='destination_route')
+    queue.declare(channel=connection.channel())
 
-    channel = connection.channel()
+    bind_queue_to_native_delayed_delivery_exchange(connection, queue)
     with connection.Producer(channel=channel) as producer:
-        routing_key = calculate_routing_key(30, 'destination')
+        routing_key = calculate_routing_key(30, 'destination_route')
         producer.publish(
             "delayed msg",
             routing_key=routing_key,

kombu/__init__.py

@@ -8,7 +8,7 @@
 from collections import namedtuple
 from typing import Any, cast
 
-__version__ = '5.5.0rc2'
+__version__ = '5.5.3'
 __author__ = 'Ask Solem'
 __contact__ = '[email protected]'
 __homepage__ = 'https://kombu.readthedocs.io'

kombu/asynchronous/aws/connection.py

@@ -183,8 +183,9 @@ def __init__(self, sqs_connection, http_client=None,
         super().__init__(sqs_connection, http_client,
                          **http_client_params)
 
-    def make_request(self, operation, params_, path, verb, callback=None):
+    def make_request(self, operation, params_, path, verb, callback=None, protocol_params=None):
         params = params_.copy()
+        params.update((protocol_params or {}).get('query', {}))
         if operation:
             params['Action'] = operation
         signer = self.sqs_connection._request_signer
@@ -203,29 +204,33 @@ def make_request(self, operation, params_, path, verb, callback=None):
 
         return self._mexe(prepared_request, callback=callback)
 
-    def get_list(self, operation, params, markers, path='/', parent=None, verb='POST', callback=None):
+    def get_list(self, operation, params, markers, path='/', parent=None, verb='POST', callback=None,
+                 protocol_params=None):
         return self.make_request(
             operation, params, path, verb,
             callback=transform(
                 self._on_list_ready, callback, parent or self, markers,
                 operation
             ),
+            protocol_params=protocol_params,
         )
 
-    def get_object(self, operation, params, path='/', parent=None, verb='GET', callback=None):
+    def get_object(self, operation, params, path='/', parent=None, verb='GET', callback=None, protocol_params=None):
         return self.make_request(
             operation, params, path, verb,
             callback=transform(
                 self._on_obj_ready, callback, parent or self, operation
             ),
+            protocol_params=protocol_params,
         )
 
-    def get_status(self, operation, params, path='/', parent=None, verb='GET', callback=None):
+    def get_status(self, operation, params, path='/', parent=None, verb='GET', callback=None, protocol_params=None):
         return self.make_request(
             operation, params, path, verb,
             callback=transform(
                 self._on_status_ready, callback, parent or self, operation
             ),
+            protocol_params=protocol_params,
         )
 
     def _on_list_ready(self, parent, markers, operation, response):