Reverted libversion change but kept version function to use new str only return value (#2108)

* Build experiment with tag checks skipped to validate p314

* Dropped python 3.7 as tool chain no longer supports

* Fixed typo in build-wheels.sh

* More build fix attempts

* Fixed 3.13+ osx artifact push

* Added missing version for windows and arm linux

* Fixed misplaced sem ver call

* Add python install for windows

* Add SPECIFIC python install for windows

* Updated windows tools target CIBW

* Removed tag checks

* Removed tag checks

* Reverted libversion change but kept version function to use new str only return value

* Fixed test expansion

Author: MSeal

src/confluent_kafka/__init__.py

@@ -55,6 +55,7 @@
     "KafkaException",
     "kafkatest",
     "libversion",
+    "version",
     "Message",
     "OFFSET_BEGINNING",
     "OFFSET_END",

src/confluent_kafka/src/confluent_kafka.c

@@ -2935,7 +2935,9 @@ PyObject *set_sasl_credentials(Handle *self, PyObject *args, PyObject *kwargs) {
 
 
 static PyObject *libversion (PyObject *self, PyObject *args) {
-	return Py_BuildValue("s", rd_kafka_version_str());
+	return Py_BuildValue("si",
+                rd_kafka_version_str(),
+                rd_kafka_version());
 }
 
 /**
@@ -2954,7 +2956,7 @@ static PyMethodDef cimpl_methods[] = {
 	 "\n"
 	},
 	{"version", version, METH_NOARGS,
-	 "  Retrieve module version string and integer\n"
+	 "  Retrieve module version string\n"
 	 "\n"
 	 "  :returns: version_string\n"
 	 "  :rtype: str\n"

tests/test_misc.py

@@ -17,8 +17,8 @@ def test_version():
     print('Using confluent_kafka module version %s' % confluent_kafka.version())
     assert len(confluent_kafka.version()) > 0
 
-    print('Using librdkafka version %s' % confluent_kafka.libversion())
-    assert len(confluent_kafka.libversion()) > 0
+    print('Using librdkafka version (%s, %i)' % confluent_kafka.libversion())
+    assert len(confluent_kafka.libversion()[0]) > 0
 
 
 def test_error_cb():