Version v1.2.0 (confluentinc#663)

rnpridgeon · web-flow · commit 8fa238add2c1 · 2019-09-26T21:13:58.000-04:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.1.0
+    LIBRDKAFKA_NUGET_VERSION: 1.2.0
     CIBW_SKIP: cp33-* cp34-*
     CIBW_TEST_REQUIRES: pytest requests avro
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
  global:
-  - LIBRDKAFKA_VERSION=v1.1.0
+  - LIBRDKAFKA_VERSION=v1.2.0
 matrix:
  include:
   # Source package verification with Python 2.7
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -2193,7 +2193,7 @@ static PyObject *libversion (PyObject *self, PyObject *args) {
  * MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
  */
 static PyObject *version (PyObject *self, PyObject *args) {
-	return Py_BuildValue("si", "1.1.0", 0x01010000);
+	return Py_BuildValue("si", "1.2.0", 0x01020000);
 }
 
 static PyMethodDef cimpl_methods[] = {
diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.0'
+version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -11,6 +11,20 @@
     'requests;python_version<"3.2"'
 ]
 
+AVRO_REQUIRES = [
+    'fastavro',
+    'requests',
+    'avro;python_version<"3.0"',
+    'avro-python3;python_version>"3.0"'
+]
+
+TEST_REQUIRES = [
+    'pytest==4.6.4;python_version<"3.0"',
+    'pytest;python_version>="3.0"',
+    'pytest-timeout',
+    'flake8'
+]
+
 # On Un*x the library is linked as -lrdkafka,
 # while on windows we need the full librdkafka name.
 if platform.system() == 'Windows':
@@ -38,7 +52,7 @@ def get_install_requirements(path):
 
 
 setup(name='confluent-kafka',
-      version='1.1.0',
+      version='1.2.0',
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='support@confluent.io',
@@ -48,11 +62,6 @@ def get_install_requirements(path):
       data_files=[('', ['LICENSE.txt'])],
       install_requires=INSTALL_REQUIRES,
       extras_require={
-          'avro': [
-              'fastavro',
-              'requests',
-              'avro;python_version<"3.0"',
-              'avro-python3;python_version>"3.0"'
-          ],
-          'dev': get_install_requirements("test-requirements.txt")
+          'avro': AVRO_REQUIRES,
+          'dev': TEST_REQUIRES + AVRO_REQUIRES
       })
diff --git a/test-requirements.txt b/test-requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -2193,7 +2193,7 @@ static PyObject libversion (PyObject self, PyObject *args) {`
`2193`	`2193`	`* MM=major, mm=minor, RR=revision, PP=patchlevel (not used)`
`2194`	`2194`	`*/`
`2195`	`2195`	`static PyObject version (PyObject self, PyObject *args) {`
`2196`		`- return Py_BuildValue("si", "1.1.0", 0x01010000);`
	`2196`	`+ return Py_BuildValue("si", "1.2.0", 0x01020000);`
`2197`	`2197`	`}`
`2198`	`2198`
`2199`	`2199`	`static PyMethodDef cimpl_methods[] = {`