Skip to content

Commit c33a0cc

Browse files
edenhilledenhill
authored
Merge pull request confluentinc#978 from confluentinc/prep152
Preps for v1.5.2 release
2 parents baee8a6 + 0b89441 commit c33a0cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+130
-124
lines changed

‎.appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
environment:
22
global:
3-
LIBRDKAFKA_NUGET_VERSION: 1.5.0
3+
LIBRDKAFKA_NUGET_VERSION: 1.5.2
44
CIBW_SKIP: cp33-* cp34-*
55
CIBW_TEST_REQUIRES: pytest pytest-timeout requests trivup
66
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
@@ -22,6 +22,7 @@ install:
2222
- SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
2323
- python --version
2424
- python -m pip install -U pip
25+
- python -m pip install -U -r tests/requirements.txt
2526

2627
build_script:
2728
- tools/windows-build.bat

‎.travis.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
env:
22
global:
3-
- LIBRDKAFKA_VERSION=v1.5.0
3+
- LIBRDKAFKA_VERSION=v1.5.2
44
jobs:
55
include:
6-
# Source package verification with Python 2.7
7-
- os: linux
6+
- name: "Source package verification with Python 2.7 (Linux)"
7+
os: linux
88
language: python
99
dist: trusty
1010
python: "2.7"
1111
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib"
12-
# Source package verification with Python 3.6
13-
- os: linux
12+
- name: "Source package verification with Python 3.6 (Linux)"
13+
os: linux
1414
language: python
1515
dist: trusty
1616
python: "3.6"
1717
env: LD_LIBRARY_PATH="$PWD/tmp-build/lib"
18-
# Source package verification with Python 2.7
19-
- os: osx
18+
- name: "Source package verification with Python 2.7 (OSX)"
19+
os: osx
2020
python: "2.7"
2121
env: DYLD_LIBRARY_PATH="$PWD/tmp-build/lib" INTERPRETER_VERSION="2.7.17"
22-
# Source package verification with Python 3.6
23-
- os: osx
22+
- name: "Source package verification with Python 3.6 (OSX) +docs"
23+
os: osx
2424
python: "3.6"
2525
env: DYLD_LIBRARY_PATH="$PWD/tmp-build/lib" MK_DOCS="y" INTERPRETER_VERSION="3.6.5"
26-
# cibuildwheel for osx
27-
- os: osx
26+
- name: "cibuildwheel (OSX)"
27+
os: osx
2828
env: CIBW_BEFORE_BUILD="tools/bootstrap-librdkafka.sh --require-ssl ${LIBRDKAFKA_VERSION} tmp" CFLAGS="-Itmp/include" LDFLAGS="-Ltmp/lib" INTERPRETER_VERSION="2.7.17"
29-
# cibuildwheel for manylinux
30-
- os: linux
29+
- name: "cibuildwheel (manylinux)"
30+
os: linux
3131
dist: trusty
3232
env:
3333
- CIBW_BEFORE_BUILD="tools/prepare-cibuildwheel-linux.sh ${LIBRDKAFKA_VERSION}"
@@ -53,22 +53,20 @@ before_install:
5353
install:
5454
- tools/install-interceptors.sh
5555
- pip install -r tests/requirements.txt
56+
- pip install tox
5657
- flake8
5758
- if [[ $MK_DOCS == y ]]; then pip install -r docs/requirements.txt; fi
5859
- 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
5960

6061
# Build wheels
61-
script:
62-
- if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse1 && tools/fixup-wheels.sh wheelhouse1 wheelhouse; fi
63-
6462
# Make plugins available for tests
6563
# Execute tests if not CIBW_BEFORE_BUILD [osx, linux]
6664
# Execute integration tests if CIBW_BEFORE_BUILD
6765
# Build docs if MK_DOCS
68-
after_script:
66+
script:
67+
- if [[ -n $TRAVIS_TAG && -n $CIBW_BEFORE_BUILD ]]; then cibuildwheel --output-dir wheelhouse1 && tools/fixup-wheels.sh wheelhouse1 wheelhouse; fi
6968
- ldd staging/libs/* || otool -L staging/libs/* || true
70-
- 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
71-
- 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
69+
- [[ -n $CIBW_BEFORE_BUILD ]] || LD_LIBRARY_PATH=$LD_LIBRARY_PATH:staging/libs DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:staging/libs tox
7270
- if [[ -n $TRAVIS_TAG && $TRAVIS_OS_NAME == osx && -n $CIBW_BEFORE_BUILD ]]; then tools/test-wheel.sh wheelhouse; fi
7371
- if [[ $MK_DOCS == y ]]; then make docs; fi
7472

‎CHANGELOG.md

Lines changed: 23 additions & 0 deletions

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include README.md
22
include LICENSE.txt
33
include test-requirements.txt
4-
include confluent_kafka/src/*.[ch]
4+
include src/confluent_kafka/src/*.[ch]

‎docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
# built documents.
5858
#
5959
# The short X.Y version.
60-
version = '1.5.0'
60+
version = '1.5.2'
6161
# The full version, including alpha/beta/rc tags.
62-
release = '1.5.0'
62+
release = version
6363

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

‎examples/docker/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ FROM alpine:3.12
3030

3131
COPY . /usr/src/confluent-kafka-python
3232

33-
ENV LIBRDKAFKA_VERSION v1.5.0
33+
ENV LIBRDKAFKA_VERSION v1.5.2
3434
ENV KAFKACAT_VERSION master
3535

3636

‎setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import platform
77

88
work_dir = os.path.dirname(os.path.realpath(__file__))
9-
mod_dir = os.path.join(work_dir, 'confluent_kafka')
9+
mod_dir = os.path.join(work_dir, 'src', 'confluent_kafka')
1010
ext_dir = os.path.join(mod_dir, 'src')
1111

1212
INSTALL_REQUIRES = [
@@ -64,13 +64,14 @@ def get_install_requirements(path):
6464
setup(name='confluent-kafka',
6565
# Make sure to bump CFL_VERSION* in confluent_kafka/src/confluent_kafka.h
6666
# and version and release in docs/conf.py.
67-
version='1.5.0',
67+
version='1.5.2',
6868
description='Confluent\'s Python client for Apache Kafka',
6969
author='Confluent Inc',
7070
author_email='support@confluent.io',
7171
url='https://github.com/confluentinc/confluent-kafka-python',
7272
ext_modules=[module],
73-
packages=find_packages(exclude=("tests", "tests.*")),
73+
packages=find_packages('src'),
74+
package_dir={'': 'src'},
7475
data_files=[('', [os.path.join(work_dir, 'LICENSE.txt')])],
7576
install_requires=INSTALL_REQUIRES,
7677
extras_require={

‎confluent_kafka/__init__.py renamed to ‎src/confluent_kafka/__init__.py

File renamed without changes.

‎confluent_kafka/admin/__init__.py renamed to ‎src/confluent_kafka/admin/__init__.py

File renamed without changes.

‎confluent_kafka/avro/__init__.py renamed to ‎src/confluent_kafka/avro/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy