Now testing Python 3.12

.github/workflows/python-package.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [2-slim, 3.5-slim, 3.6-slim, 3.7-slim, 3.8-slim, 3.9-slim, 3.10-slim, 3.11-slim]
+        python_version: [2-slim, 3.5-slim, 3.6-slim, 3.7-slim, 3.8-slim, 3.9-slim, 3.10-slim, 3.11-slim, 3.12-slim]
         group: [1, 2]
         scenario:
           - default
@@ -24,10 +24,10 @@ jobs:
         run: |
           set -e
           docker info
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install dependencies
         run: |
           pip install -r test-requirements.txt

.github/workflows/python-release.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: Install dependencies
         run: |
           pip install -r requirements.txt

README.md

@@ -657,6 +657,7 @@ This library is tested with the following versions of Python:
 * Python 3.9
 * Python 3.10
 * Python 3.11
+* Python 3.12
 
 ## Ansible compatibility
 To date, this library is compatible with all known versions of Ansible 2.X (`ansible`/`ansible-core` 2.X).

library/kafka_acl.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_acl import process_module_acl

library/kafka_acls.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_acl import process_module_acls

library/kafka_consumer_group.py

@@ -9,6 +9,9 @@
 
 from pkg_resources import parse_version
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.pycompat24 import get_exception
 from kafka.errors import KafkaError

library/kafka_info.py

@@ -9,6 +9,9 @@
 
 from pkg_resources import parse_version
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.ansible_release import __version__ as ansible_version
 
 # import module snippets

library/kafka_lib.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_acl import process_module_acl

library/kafka_quotas.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_quotas import process_module_quotas

library/kafka_stat_lag.py

@@ -10,6 +10,9 @@
 # import module snippets
 import json
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.pycompat24 import get_exception
 from kafka.errors import KafkaError

library/kafka_topic.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_topic import process_module_topic

library/kafka_topics.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_topic import process_module_topics

library/kafka_user.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_user import (

library/kafka_users.py

@@ -10,6 +10,9 @@
 import logging
 import sys
 
+# XXX: fix kafka-python import broken for Python 3.12
+import ansible.module_utils.kafka_fix_import  # noqa
+
 from ansible.module_utils.basic import AnsibleModule
 
 from ansible.module_utils.kafka_lib_user import (

module_utils/kafka_fix_import.py

@@ -0,0 +1,7 @@
+import sys
+import types
+
+if sys.version_info >= (3, 12, 0):
+    m = types.ModuleType('kafka.vendor.six.moves', 'Mock module')
+    setattr(m, 'range', range)
+    sys.modules['kafka.vendor.six.moves'] = m

molecule/default/molecule.yml

@@ -4,8 +4,8 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  yamllint .
+#lint: |
+#  yamllint .
 platforms:
   #########################################################
   # Executors
@@ -404,7 +404,7 @@ provisioner:
 scenario:
   name: default
   create_sequence:
-    - lint
+    #- lint
     - destroy
     - dependency
     - syntax

molecule/default/tests/ansible_utils.py

@@ -3,6 +3,13 @@
 import json
 import six
 import testinfra
+import sys
+import types
+
+if sys.version_info >= (3, 12, 0):
+    m = types.ModuleType('kafka.vendor.six.moves', 'Mock module')
+    setattr(m, 'range', range)
+    sys.modules['kafka.vendor.six.moves'] = m
 
 from pkg_resources import parse_version
 

molecule/scram-kafka-270/molecule.yml

@@ -4,8 +4,8 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint: |
-  yamllint .
+#lint: |
+#  yamllint .
 platforms:
   #########################################################
   # Executors
@@ -142,7 +142,7 @@ provisioner:
 scenario:
   name: scram-kafka-270
   create_sequence:
-    - lint
+    # - lint
     - destroy
     - dependency
     - syntax

molecule/scram-kafka-270/tests/test_users.py

@@ -1,5 +1,12 @@
 import time
 import uuid
+import sys
+import types
+
+if sys.version_info >= (3, 12, 0):
+    m = types.ModuleType('kafka.vendor.six.moves', 'Mock module')
+    setattr(m, 'range', range)
+    sys.modules['kafka.vendor.six.moves'] = m
 
 from kafka import KafkaConsumer, KafkaProducer, TopicPartition
 

requirements.txt

@@ -1,3 +1,4 @@
 kafka-python>=2.0.0,<2.1.0
 kazoo==2.6.1
 pure-sasl==0.5.1
+setuptools; python_version >= '3.12'

test-requirements.txt

@@ -1,13 +1,13 @@
 urllib3<2.0.0
-ansible==7.3.0
-ansible-compat==3.0.1
+ansible==8.5.0
+ansible-compat==4.1.11
 ansible-lint==6.14.2
 funcsigs
-molecule==4.0.4
+molecule==6.0.3
 molecule-plugins[docker]==23.0.0
-pytest-testinfra==6.1.0
-pytest-xdist==2.2.1
-pytest-instafail==0.4.2
-pytest-split==0.3.3
-pytest-timeout==1.4.2
+pytest-testinfra==10.0.0
+pytest-xdist==3.5.0
+pytest-instafail==0.5.0
+pytest-split==0.8.2
+pytest-timeout==2.2.0
 flake8==5.0.4

tests/module_utils/test_kafka_acls.py

@@ -1,4 +1,4 @@
-
+import module_utils.kafka_fix_import  # noqa
 from module_utils.kafka_acl import ACLResourceType as rs
 from module_utils.kafka_acl import ACLOperation as op
 from module_utils.kafka_acl import (

tests/module_utils/test_kafka_scram.py

@@ -1,5 +1,6 @@
 import pytest
 
+import module_utils.kafka_fix_import  # noqa
 from module_utils import kafka_scram