Skip to content

Commit 8fa238a

Browse files
authored
Version v1.2.0 (#663)
1 parent 7ba4ab7 commit 8fa238a

File tree

6 files changed

+22
-15
lines changed

6 files changed

+22
-15
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
environment:
22
global:
3-
LIBRDKAFKA_NUGET_VERSION: 1.1.0
3+
LIBRDKAFKA_NUGET_VERSION: 1.2.0
44
CIBW_SKIP: cp33-* cp34-*
55
CIBW_TEST_REQUIRES: pytest requests avro
66
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
env:
22
global:
3-
- LIBRDKAFKA_VERSION=v1.1.0
3+
- LIBRDKAFKA_VERSION=v1.2.0
44
matrix:
55
include:
66
# Source package verification with Python 2.7

confluent_kafka/src/confluent_kafka.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2193,7 +2193,7 @@ static PyObject *libversion (PyObject *self, PyObject *args) {
21932193
* MM=major, mm=minor, RR=revision, PP=patchlevel (not used)
21942194
*/
21952195
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);
21972197
}
21982198

21992199
static PyMethodDef cimpl_methods[] = {

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# built documents.
5656
#
5757
# The short X.Y version.
58-
version = '1.1.0'
58+
version = '1.2.0'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '1.1.0'
60+
release = '1.2.0'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

setup.py

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,20 @@
1111
'requests;python_version<"3.2"'
1212
]
1313

14+
AVRO_REQUIRES = [
15+
'fastavro',
16+
'requests',
17+
'avro;python_version<"3.0"',
18+
'avro-python3;python_version>"3.0"'
19+
]
20+
21+
TEST_REQUIRES = [
22+
'pytest==4.6.4;python_version<"3.0"',
23+
'pytest;python_version>="3.0"',
24+
'pytest-timeout',
25+
'flake8'
26+
]
27+
1428
# On Un*x the library is linked as -lrdkafka,
1529
# while on windows we need the full librdkafka name.
1630
if platform.system() == 'Windows':
@@ -38,7 +52,7 @@ def get_install_requirements(path):
3852

3953

4054
setup(name='confluent-kafka',
41-
version='1.1.0',
55+
version='1.2.0',
4256
description='Confluent\'s Python client for Apache Kafka',
4357
author='Confluent Inc',
4458
author_email='support@confluent.io',
@@ -48,11 +62,6 @@ def get_install_requirements(path):
4862
data_files=[('', ['LICENSE.txt'])],
4963
install_requires=INSTALL_REQUIRES,
5064
extras_require={
51-
'avro': [
52-
'fastavro',
53-
'requests',
54-
'avro;python_version<"3.0"',
55-
'avro-python3;python_version>"3.0"'
56-
],
57-
'dev': get_install_requirements("test-requirements.txt")
65+
'avro': AVRO_REQUIRES,
66+
'dev': TEST_REQUIRES + AVRO_REQUIRES
5867
})

test-requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)