Fix wheel generation

pranavrth · pranavrth · commit abb48bd4232f · 2024-11-18T17:16:25.000+05:30
diff --git a/tests/common/__init__.py b/tests/common/__init__.py
@@ -17,18 +17,12 @@
 #
 
 import os
-from confluent_kafka import Consumer, DeserializingConsumer
-from confluent_kafka.avro import AvroConsumer
+from confluent_kafka import Consumer
 
 _GROUP_PROTOCOL_ENV = 'TEST_CONSUMER_GROUP_PROTOCOL'
 _TRIVUP_CLUSTER_TYPE_ENV = 'TEST_TRIVUP_CLUSTER_TYPE'
 
 
-def _update_conf_group_protocol(conf=None):
-    if conf is not None and 'group.id' in conf and TestUtils.use_group_protocol_consumer():
-        conf['group.protocol'] = 'consumer'
-
-
 def _trivup_cluster_type_kraft():
     return _TRIVUP_CLUSTER_TYPE_ENV in os.environ and os.environ[_TRIVUP_CLUSTER_TYPE_ENV] == 'kraft'
 
@@ -42,20 +36,13 @@ def use_kraft():
     def use_group_protocol_consumer():
         return _GROUP_PROTOCOL_ENV in os.environ and os.environ[_GROUP_PROTOCOL_ENV] == 'consumer'
 
+    @staticmethod
+    def update_conf_group_protocol(conf=None):
+        if conf is not None and 'group.id' in conf and TestUtils.use_group_protocol_consumer():
+            conf['group.protocol'] = 'consumer'
+
 
 class TestConsumer(Consumer):
     def __init__(self, conf=None, **kwargs):
-        _update_conf_group_protocol(conf)
+        TestUtils.update_conf_group_protocol(conf)
         super(TestConsumer, self).__init__(conf, **kwargs)
-
-
-class TestDeserializingConsumer(DeserializingConsumer):
-    def __init__(self, conf=None, **kwargs):
-        _update_conf_group_protocol(conf)
-        super(TestDeserializingConsumer, self).__init__(conf, **kwargs)
-
-
-class TestAvroConsumer(AvroConsumer):
-    def __init__(self, conf=None, **kwargs):
-        _update_conf_group_protocol(conf)
-        super(TestAvroConsumer, self).__init__(conf, **kwargs)
diff --git a/tests/common/schema_registry/__init__.py b/tests/common/schema_registry/__init__.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2024 Confluent Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+from confluent_kafka import DeserializingConsumer
+from confluent_kafka.avro import AvroConsumer
+from tests.common import TestUtils
+
+
+class TestDeserializingConsumer(DeserializingConsumer):
+    def __init__(self, conf=None, **kwargs):
+        TestUtils.update_conf_group_protocol(conf)
+        super(TestDeserializingConsumer, self).__init__(conf, **kwargs)
+
+
+class TestAvroConsumer(AvroConsumer):
+    def __init__(self, conf=None, **kwargs):
+        TestUtils.update_conf_group_protocol(conf)
+        super(TestAvroConsumer, self).__init__(conf, **kwargs)
diff --git a/tests/integration/cluster_fixture.py b/tests/integration/cluster_fixture.py
@@ -25,7 +25,8 @@
 from confluent_kafka.admin import AdminClient, NewTopic
 from confluent_kafka.schema_registry.schema_registry_client import SchemaRegistryClient
 
-from tests.common import TestDeserializingConsumer, TestConsumer
+from tests.common import TestConsumer
+from tests.common.schema_registry import TestDeserializingConsumer
 
 
 class KafkaClusterFixture(object):
diff --git a/tests/integration/integration_test.py b/tests/integration/integration_test.py
@@ -31,7 +31,8 @@
 
 import confluent_kafka
 
-from tests.common import TestConsumer, TestAvroConsumer
+from tests.common import TestConsumer
+from tests.common.schema_registry import TestAvroConsumer
 
 try:
     # Memory tracker
diff --git a/tests/test_log.py b/tests/test_log.py
@@ -7,7 +7,8 @@
 import confluent_kafka.avro
 import confluent_kafka.admin
 
-from tests.common import TestConsumer, TestAvroConsumer
+from tests.common import TestConsumer
+from tests.common.schema_registry import TestAvroConsumer
 
 
 class CountingFilter(logging.Filter):
diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat
@@ -15,7 +15,7 @@ echo on
 
 set CIBW_BUILD=cp37-%BW_ARCH% cp38-%BW_ARCH% cp39-%BW_ARCH% cp310-%BW_ARCH% cp311-%BW_ARCH% cp312-%BW_ARCH% cp313-%BW_ARCH%
 set CIBW_BEFORE_BUILD=python -m pip install delvewheel==1.1.4
-set CIBW_TEST_REQUIRES=-r requirements/requirements-test.txt
+set CIBW_TEST_REQUIRES=pytest
 set CIBW_TEST_COMMAND=pytest {project}\tests\test_Producer.py
 rem set CIBW_BUILD_VERBOSITY=3
 set include=%cd%\%DEST%\build\native\include
diff --git a/tools/wheels/build-wheels.sh b/tools/wheels/build-wheels.sh
@@ -10,7 +10,7 @@ this_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # Skip PyPy, Python2, old Python3 versions, musl, and x86 builds.
 export CIBW_SKIP="pp* cp27-* cp35-* cp36-* *i686 *musllinux* $CIBW_SKIP"
 # Run a simple test suite
-export CIBW_TEST_REQUIRES="-r requirements/requirements-tests.txt"
+export CIBW_TEST_REQUIRES="pytest"
 export CIBW_TEST_COMMAND="pytest {project}/tests/test_Producer.py"
 export CIBW_MANYLINUX_X86_64_IMAGE="manylinux_2_28"
 export CIBW_MANYLINUX_AARCH64_IMAGE="manylinux_2_28"
