Updated trivup to 0.12.7

confluentinc · Oct 21, 2024 · 02875bc · 02875bc
1 parent c7ca2f8
commit 02875bc
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 15 deletions.
diff --git a/requirements/requirements-tests-install.txt b/requirements/requirements-tests-install.txt
@@ -2,4 +2,5 @@
 -r requirements-schemaregistry.txt  
 -r requirements-avro.txt  
 -r requirements-protobuf.txt  
--r requirements-json.txt 
+-r requirements-json.txt
+tests/trivup/trivup-0.12.7.tar.gz
diff --git a/requirements/requirements-tests.txt b/requirements/requirements-tests.txt
@@ -4,5 +4,4 @@ urllib3 >= 2.0.0,<3; python_version > "3.7"
 flake8
 pytest
 pytest-timeout
-requests-mock
-trivup>=0.8.3
+requests-mock
diff --git a/tests/README.md b/tests/README.md
@@ -18,7 +18,8 @@ A python3 env suitable for running tests:
 
     $ python3 -m venv venv_test
     $ source venv_test/bin/activate
-    $ python3 -m pip install .[tests]
+    $ python3 -m pip install -r requirements/requirements-tests-install.txt
+    $ python3 -m pip install .
 
 When you're finished with it:
 

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -34,24 +34,20 @@ def _broker_conf():
     return broker_conf
 
 
-def _broker_version():
-    return 'trunk@f6c9feea76d01a46319b0ca602d70aa855057b07' if TestUtils.use_group_protocol_consumer() else '3.8.0'
-
-
 def create_trivup_cluster(conf={}):
     trivup_fixture_conf = {'with_sr': True,
                            'debug': True,
                            'cp_version': '7.6.0',
                            'kraft': TestUtils.use_kraft(),
-                           'version': _broker_version(),
+                           'version': '3.8.0',
                            'broker_conf': _broker_conf()}
     trivup_fixture_conf.update(conf)
     return TrivupFixture(trivup_fixture_conf)
 
 
 def create_sasl_cluster(conf={}):
     trivup_fixture_conf = {'with_sr': False,
-                           'version': _broker_version(),
+                           'version': '3.8.0',
                            'sasl_mechanism': "PLAIN",
                            'kraft': TestUtils.use_kraft(),
                            'sasl_users': 'sasl_user=sasl_user',

diff --git a/tests/integration/consumer/test_consumer_topicpartition_metadata.py b/tests/integration/consumer/test_consumer_topicpartition_metadata.py
@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limit
 
-import time
 from confluent_kafka import TopicPartition
 
 
@@ -35,8 +34,6 @@ def test_consumer_topicpartition_metadata(kafka_cluster):
     consumer_conf = {'group.id': 'pytest'}
 
     c = kafka_cluster.consumer(consumer_conf)
-    c.subscribe([topic])
-    time.sleep(5)
 
     # Commit without any metadata.
     metadata = None

diff --git a/tests/trivup/trivup-0.12.6.tar.gz b/tests/trivup/trivup-0.12.6.tar.gz
diff --git a/tests/trivup/trivup-0.12.7.tar.gz b/tests/trivup/trivup-0.12.7.tar.gz
diff --git a/tox.ini b/tox.ini
@@ -7,7 +7,8 @@ passenv =
     *
 commands =
     # Install main package and all sub-packages
-    pip install .[tests]
+    pip install -r requirements/requirements-tests-install.txt
+    pip install .
     # Early verification that module is loadable
     python -c 'import confluent_kafka ; print(confluent_kafka.version())'
     # Run tests (large timeout to allow docker image downloads)
@@ -25,6 +26,6 @@ testpaths = tests
 norecursedirs = tests/integration/*/java
 
 [flake8]
-exclude = venv*,.venv*,env,.env,.tox,.toxenv,.git,build,docs,tools,tmp-build,*_pb2.py,tmp-KafkaCluster/*
+exclude = venv*,.venv*,env,.env,.tox,.toxenv,.git,build,docs,tools,tmp-build,*_pb2.py,*tmp-KafkaCluster/*
 max-line-length = 119
 accept-encodings = utf-8