Update packaging and bump RC (confluentinc#426)

Ryan P · web-flow · commit ebbd9a5fe938 · 2018-07-19T13:13:35.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,43 @@
 matrix:
  include:
-  # Source package verification with Python 2.7 and librdkafka master
+  # Source package verification with Python 2.7 and librdkafka v0.11.5
   - os: linux
     language: python
     dist: trusty
     python: "2.7"
-    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=master
-  # Source package verification with Python 3.6 and librdkafka master
+    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
+  # Source package verification with Python 3.6 and librdkafka v0.11.5
   - os: linux
     language: python
     dist: trusty
     python: "3.6"
-    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=master
+    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
+  # Source package verification with Python 2.7 and librdkafka v0.11.5
+  - os: osx
+    python: "2.7"
+    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
+    before_install:
+        - brew update && brew upgrade pyenv
+        - pyenv install -f 2.7.15
+        - virtualenv -p ~/.pyenv/versions/2.7.15/bin/python ./env
+        - source env/bin/activate
+  # Source package verification with Python 3.6 and librdkafka v0.11.5
+  - os: osx
+    python: "3.6"
+    env: LD_LIBRARY_PATH="$PWD/tmp-build/lib" LIBRDKAFKA_VERSION=v0.11.5
+    before_install:
+        - brew update && brew upgrade pyenv
+        - pyenv install -f 3.6.5
+        - virtualenv -p ~/.pyenv/versions/3.6.5/bin/python ./env
+        - source env/bin/activate
   # cibuildwheel for osx
   - os: osx
-    env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl master tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
+    env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl v0.11.5 tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib"
   # cibuildwheel for manylinux
   - os: linux
     dist: trusty
     sudo: required
-    env: CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh master"
+    env: CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh v0.11.5"
     language: python
     python: "2.7"
     services: docker
@@ -29,7 +47,7 @@ install:
  - pip install -U pip
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then pip install pytest-timeout flake8 ; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then rm -rf tmp-build ; tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp-build ; fi
- - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then pip install cibuildwheel==0.4.1 ; fi
+ - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then pip install cibuildwheel; fi
 
 
 script:
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -2156,7 +2156,7 @@ static PyObject *libversion (PyObject *self, PyObject *args) {
 }
 
 static PyObject *version (PyObject *self, PyObject *args) {
-	return Py_BuildValue("si", "0.11.5rc5", 0x000b0500);
+	return Py_BuildValue("si", "0.11.5rc6", 0x000b0500);
 }
 
 static PyMethodDef cimpl_methods[] = {
diff --git a/docs/conf.py b/docs/conf.py
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '0.11.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.5'
+release = '0.11.5rc6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@ def get_install_requirements(path):
 
 
 setup(name='confluent-kafka',
-      version='0.11.5rc5',
+      version='0.11.5rc6',
       description='Confluent\'s Apache Kafka client for Python',
       author='Confluent Inc',
       author_email='support@confluent.io',

Original file line number	Diff line number	Diff line change
`@@ -2156,7 +2156,7 @@ static PyObject libversion (PyObject self, PyObject *args) {`
`2156`	`2156`	`}`
`2157`	`2157`
`2158`	`2158`	`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);`
`2160`	`2160`	`}`
`2161`	`2161`
`2162`	`2162`	`static PyMethodDef cimpl_methods[] = {`