Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Initial python 3.9 client wheel build support #9389

Merged
merged 4 commits into from
Feb 12, 2021
Merged

Initial python 3.9 client wheel build support #9389

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad686e0
Fix build-client-lib-within-docker.sh
vkvm Feb 1, 2021
65dd941
Fix `build-client-lib.sh` and add py39
vkvm Feb 1, 2021
8a0df93
Add py39 to remaining build scripts
vkvm Feb 1, 2021
cd8acc0
pulsar-cpp-client - python39 push-images.sh
vkvm Feb 7, 2021
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
6 changes: 3 additions & 3 deletions pulsar-client-cpp/docker/build-client-lib-within-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ set -e -x

cd /pulsar/pulsar-client-cpp

find . -name CMakeCache.txt | xargs rm
find . -name CMakeFiles | xargs rm -rf
rm lib/*.pb.*
find . -name CMakeCache.txt | xargs -r rm
find . -name CMakeFiles | xargs -r rm -rf
rm -f lib/*.pb.*

cmake . -DBUILD_TESTS=OFF -DLINK_STATIC=ON \
-DPYTHON_INCLUDE_DIR=/opt/python/$PYTHON_SPEC/include/python$PYTHON_VERSION \
Expand Down
3 changes: 2 additions & 1 deletion pulsar-client-cpp/docker/build-client-lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cd $ROOT_DIR

PYTHON_VERSIONS=(
'3.6 cp36-cp36m'
'3.9 cp39-cp39'
)

for line in "${PYTHON_VERSIONS[@]}"; do
Expand All @@ -42,7 +43,7 @@ for line in "${PYTHON_VERSIONS[@]}"; do

VOLUME_OPTION=${VOLUME_OPTION:-"-v $ROOT_DIR:/pulsar"}
COMMAND="/pulsar/pulsar-client-cpp/docker/build-client-lib-within-docker.sh"
DOCKER_CMD="docker run -i ${VOLUME_OPTION} ${IMAGE}"
DOCKER_CMD="docker run -i ${VOLUME_OPTION} ${IMAGE_NAME}"

$DOCKER_CMD bash -c "${COMMAND}"

Expand Down
1 change: 1 addition & 0 deletions pulsar-client-cpp/docker/build-wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ PYTHON_VERSIONS=(
'3.6 cp36-cp36m'
'3.7 cp37-cp37m'
'3.8 cp38-cp38'
'3.9 cp39-cp39'
)

function contains() {
Expand Down
1 change: 1 addition & 0 deletions pulsar-client-cpp/docker/create-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ PYTHON_VERSIONS=(
'3.6 cp36-cp36m'
'3.7 cp37-cp37m'
'3.8 cp38-cp38'
'3.9 cp39-cp39'
)

for line in "${PYTHON_VERSIONS[@]}"; do
Expand Down
3 changes: 2 additions & 1 deletion pulsar-client-cpp/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ endif()
set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY}
${Boost_PYTHON27-MT_LIBRARY} ${Boost_PYTHON37-MT_LIBRARY}
${Boost_PYTHON34_LIBRARY} ${Boost_PYTHON35_LIBRARY}
${Boost_PYTHON36_LIBRARY} ${Boost_PYTHON38_LIBRARY})
${Boost_PYTHON36_LIBRARY} ${Boost_PYTHON38_LIBRARY}
${Boost_PYTHON39_LIBRARY})

if (APPLE)
set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS}
Expand Down