Update kafka broker test matrix; test against 3.9.0

Author: dpkp

.github/workflows/python-package.yml

@@ -29,8 +29,10 @@ jobs:
           - "0.11.0.3"
           - "1.1.1"
           - "2.4.0"
-          - "2.5.0"
-          - "2.6.0"
+          - "2.8.2"
+          - "3.0.2"
+          - "3.5.2"
+          - "3.9.0"
         python:
           - "3.12"
         include:
@@ -41,13 +43,13 @@ jobs:
           #  kafka: "2.6.0"
           #  experimental: true
           - python: "3.8"
-            kafka: "2.6.0"
+            kafka: "3.9.0"
           - python: "3.9"
-            kafka: "2.6.0"
+            kafka: "3.9.0"
           - python: "3.10"
-            kafka: "2.6.0"
+            kafka: "3.9.0"
           - python: "3.11"
-            kafka: "2.6.0"
+            kafka: "3.9.0"
 
     steps:
       - uses: actions/checkout@v4

kafka/conn.py

@@ -1181,6 +1181,7 @@ def _infer_broker_version_from_api_versions(self, api_versions):
         # in reverse order. As soon as we find one that works, return it
         test_cases = [
             # format (<broker version>, <needed struct>)
+            # Make sure to update consumer_integration test check when adding newer versions.
             ((2, 6, 0), DescribeClientQuotasRequest[0]),
             ((2, 5, 0), DescribeAclsRequest_v2),
             ((2, 4, 0), ProduceRequest[8]),

test/test_consumer_integration.py

@@ -13,6 +13,7 @@
 
 
 @pytest.mark.skipif(not env_kafka_version(), reason="No KAFKA_VERSION set")
+@pytest.mark.skipif(env_kafka_version()[:2] > (2, 6, 0), reason="KAFKA_VERSION newer than max inferred version")
 def test_kafka_version_infer(kafka_consumer_factory):
     consumer = kafka_consumer_factory()
     actual_ver_major_minor = env_kafka_version()[:2]