Merge pull request #978 from confluentinc/prep152

Preps for v1.5.2 release

Author: edenhill

.appveyor.yml

@@ -1,6 +1,6 @@
 environment:
   global:
-    LIBRDKAFKA_NUGET_VERSION: 1.5.0
+    LIBRDKAFKA_NUGET_VERSION: 1.5.2
     CIBW_SKIP: cp33-* cp34-*
     CIBW_TEST_REQUIRES: pytest pytest-timeout requests trivup
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
@@ -22,6 +22,7 @@ install:
   - SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
   - python --version
   - python -m pip install -U pip
+  - python -m pip install -U -r tests/requirements.txt
 
 build_script:
   - tools/windows-build.bat

.travis.yml

@@ -1,33 +1,33 @@
 env:
  global:
-  - LIBRDKAFKA_VERSION=v1.5.0
+  - LIBRDKAFKA_VERSION=v1.5.2
 jobs:
  include:
-  # Source package verification with Python 2.7
-  - os: linux
+  - name: "Source package verification with Python 2.7 (Linux)"
+    os: linux
     language: python
     dist: trusty
     python: "2.7"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib"
-  # Source package verification with Python 3.6
-  - os: linux
+  - name: "Source package verification with Python 3.6 (Linux)"
+    os: linux
     language: python
     dist: trusty
     python: "3.6"
     env: LD_LIBRARY_PATH="$PWD/tmp-build/lib"
-  # Source package verification with Python 2.7
-  - os: osx
+  - name: "Source package verification with Python 2.7 (OSX)"
+    os: osx
     python: "2.7"
     env: DYLD_LIBRARY_PATH="$PWD/tmp-build/lib" INTERPRETER_VERSION="2.7.17"
-  # Source package verification with Python 3.6
-  - os: osx
+  - name: "Source package verification with Python 3.6 (OSX) +docs"
+    os: osx
     python: "3.6"
     env: DYLD_LIBRARY_PATH="$PWD/tmp-build/lib" MK_DOCS="y" INTERPRETER_VERSION="3.6.5"
-  # cibuildwheel for osx
-  - os: osx
+  - name: "cibuildwheel (OSX)"
+    os: osx
     env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib" INTERPRETER_VERSION="2.7.17"
-  # cibuildwheel for manylinux
-  - os: linux
+  - name: "cibuildwheel (manylinux)"
+    os: linux
     dist: trusty
     env:
       - CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh ${LIBRDKAFKA_VERSION}"
@@ -53,22 +53,20 @@ before_install:
 install:
  - tools/install-interceptors.sh
  - pip install -r tests/requirements.txt
+ - pip install tox
  - flake8
  - if [[ $MK_DOCS == y ]]; then pip install -r docs/requirements.txt; fi
  - if [[ -z $CIBW_BEFORE_BUILD ]]; then tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp-build && pip install --global-option=build_ext --global-option="-Itmp-build/include/" --global-option="-Ltmp-build/lib" . .[avro]; fi
 
 # Build wheels
-script:
- - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse1 && tools/fixup-wheels.sh wheelhouse1 wheelhouse; fi
-
 # Make plugins available for tests
 # Execute tests if not CIBW_BEFORE_BUILD [osx, linux]
 # Execute integration tests if CIBW_BEFORE_BUILD
 # Build docs if MK_DOCS
-after_script:
+script:
+ - if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse1 && tools/fixup-wheels.sh wheelhouse1 wheelhouse; fi
  - ldd staging/libs/* || otool -L staging/libs/* || true
- - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME == "osx" ]]; then DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs py.test --timeout=60 --ignore=tmp-build --import-mode append; fi
- - if [[ -z $CIBW_BEFORE_BUILD && $TRAVIS_OS_NAME == "linux" ]]; then LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs py.test --timeout=60 --ignore=tmp-build --import-mode append; fi
+ - [[ -n $CIBW_BEFORE_BUILD ]] || LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs tox
  - if [[ -n $TRAVIS_TAG && $TRAVIS_OS_NAME == osx && -n $CIBW_BEFORE_BUILD ]]; then tools/test-wheel.sh wheelhouse; fi
  - if [[ $MK_DOCS == y ]]; then make docs; fi
 

CHANGELOG.md

@@ -1,4 +1,4 @@
 include README.md
 include LICENSE.txt
 include test-requirements.txt
-include confluent_kafka/src/*.[ch]
+include src/confluent_kafka/src/*.[ch]

MANIFEST.in

@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.5.0'
+version = '1.5.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/conf.py

@@ -30,7 +30,7 @@ FROM alpine:3.12
 
 COPY . /usr/src/confluent-kafka-python
 
-ENV LIBRDKAFKA_VERSION v1.5.0
+ENV LIBRDKAFKA_VERSION v1.5.2
 ENV KAFKACAT_VERSION master
 
 

examples/docker/Dockerfile.alpine

@@ -6,7 +6,7 @@
 import platform
 
 work_dir = os.path.dirname(os.path.realpath(__file__))
-mod_dir = os.path.join(work_dir, 'confluent_kafka')
+mod_dir = os.path.join(work_dir, 'src', 'confluent_kafka')
 ext_dir = os.path.join(mod_dir, 'src')
 
 INSTALL_REQUIRES = [
@@ -64,13 +64,14 @@ def get_install_requirements(path):
 setup(name='confluent-kafka',
       # Make sure to bump CFL_VERSION* in confluent_kafka/src/confluent_kafka.h
       # and version and release in docs/conf.py.
-      version='1.5.0',
+      version='1.5.2',
       description='Confluent\'s Python client for Apache Kafka',
       author='Confluent Inc',
       author_email='[email protected]',
       url='https://github.com/confluentinc/confluent-kafka-python',
       ext_modules=[module],
-      packages=find_packages(exclude=("tests", "tests.*")),
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
       data_files=[('', [os.path.join(work_dir, 'LICENSE.txt')])],
       install_requires=INSTALL_REQUIRES,
       extras_require={