Skip to content

Commit ebbd9a5

Browse files
author
Ryan P
authored
Update packaging and bump RC (#426)
1 parent 4325212 commit ebbd9a5

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

.travis.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,43 @@
11
matrix:
22
include:
3-
# Source package verification with Python 2.7 and librdkafka master
3+
# Source package verification with Python 2.7 and librdkafka v0.11.5
44
- os: linux
55
language: python
66
dist: trusty
77
python: "2.7"
8-
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=master
9-
# Source package verification with Python 3.6 and librdkafka master
8+
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
9+
# Source package verification with Python 3.6 and librdkafka v0.11.5
1010
- os: linux
1111
language: python
1212
dist: trusty
1313
python: "3.6"
14-
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=master
14+
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
15+
# Source package verification with Python 2.7 and librdkafka v0.11.5
16+
- os: osx
17+
python: "2.7"
18+
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
19+
before_install:
20+
- brew update && brew upgrade pyenv
21+
- pyenv install -f 2.7.15
22+
- virtualenv -p ~/.pyenv/versions/2.7.15/bin/python ./env
23+
- source env/bin/activate
24+
# Source package verification with Python 3.6 and librdkafka v0.11.5
25+
- os: osx
26+
python: "3.6"
27+
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
28+
before_install:
29+
- brew update && brew upgrade pyenv
30+
- pyenv install -f 3.6.5
31+
- virtualenv -p ~/.pyenv/versions/3.6.5/bin/python ./env
32+
- source env/bin/activate
1533
# cibuildwheel for osx
1634
- os: osx
17-
env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl master tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
35+
env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl v0.11.5 tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
1836
# cibuildwheel for manylinux
1937
- os: linux
2038
dist: trusty
2139
sudo: required
22-
env: CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh master"
40+
env: CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh v0.11.5"
2341
language: python
2442
python: "2.7"
2543
services: docker
@@ -29,7 +47,7 @@ install:
2947
- pip install -U pip
3048
- if [[ -z $CIBW_BEFORE_BUILD ]]; then pip install pytest-timeout flake8 ; fi
3149
- if [[ -z $CIBW_BEFORE_BUILD ]]; then rm -rf tmp-build ; tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp-build ; fi
32-
- if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then pip install cibuildwheel==0.4.1 ; fi
50+
- if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then pip install cibuildwheel; fi
3351

3452

3553
script:

confluent_kafka/src/confluent_kafka.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2156,7 +2156,7 @@ static PyObject *libversion (PyObject *self, PyObject *args) {
21562156
}
21572157

21582158
static PyObject *version (PyObject *self, PyObject *args) {
2159-
return Py_BuildValue("si", "0.11.5rc5", 0x000b0500);
2159+
return Py_BuildValue("si", "0.11.5rc6", 0x000b0500);
21602160
}
21612161

21622162
static PyMethodDef cimpl_methods[] = {

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
# The short X.Y version.
5858
version = '0.11.5'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '0.11.5'
60+
release = '0.11.5rc6'
6161

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

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def get_install_requirements(path):
3333

3434

3535
setup(name='confluent-kafka',
36-
version='0.11.5rc5',
36+
version='0.11.5rc6',
3737
description='Confluent\'s Apache Kafka client for Python',
3838
author='Confluent Inc',
3939
author_email='[email protected]',

0 commit comments

Comments
 (0)