Skip to content

V.1.2.0 rc1 #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion confluent_kafka/src/confluent_kafka.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
25 changes: 17 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down Expand Up @@ -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',
Expand All @@ -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
})
2 changes: 0 additions & 2 deletions test-requirements.txt

This file was deleted.