Skip to content

[WIP] Remove Python 2 support for Python client #8624

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

Closed
BewareMyPower wants to merge 4 commits into from
Closed

[WIP] Remove Python 2 support for Python client #8624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa875f3
Remove Python2 from cpp build
BewareMyPower Nov 19, 2020
97a6ad1
Revert unrelated changes
BewareMyPower Nov 19, 2020
ee2af5a
Find Boost::Python for Python3
BewareMyPower Feb 11, 2021
4e059b2
Fix docker-build.sh
BewareMyPower Feb 11, 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
3 changes: 1 addition & 2 deletions pulsar-client-cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,7 @@ if (BUILD_PYTHON_WRAPPER)
# For python3 the lib name is boost_python3
set(BOOST_PYTHON_NAME_LIST python36;python37;python38;python3;python3-mt;python-py${BOOST_PYTHON_NAME_POSTFIX};python${BOOST_PYTHON_NAME_POSTFIX}-mt;python${BOOST_PYTHON_NAME_POSTFIX})
else ()
# Regular boost_python
set(BOOST_PYTHON_NAME_LIST python;python-mt;python-py27;python27-mt;python27)
MESSAGE(FATAL_ERROR "Boost.Python only supports Python3")
endif ()

foreach (BOOST_PYTHON_NAME IN LISTS BOOST_PYTHON_NAME_LIST)
Expand Down
9 changes: 8 additions & 1 deletion pulsar-client-cpp/docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@ echo "---- Build Pulsar C++ client using image $IMAGE (pass <skip-clean> for inc
docker pull $IMAGE

VOLUME_OPTION=${VOLUME_OPTION:-"-v $ROOT_DIR:/pulsar"}
COMMAND="cd /pulsar/pulsar-client-cpp && cmake . $CMAKE_ARGS && make check-format && make -j8"
PYTHON_INCLUDE_DIR="\$(python3 -c \"from distutils.sysconfig import get_python_inc; print(get_python_inc())\")"
PYTHON_LIBRARY="\$(python3 -c \"import distutils.sysconfig as sysconfig; print(sysconfig.get_config_var('LIBDIR'))\")"
CMAKE_ARGS="-DPYTHON_INCLUDE_DIR=\"$PYTHON_INCLUDE_DIR\" -DPYTHON_LIBRARY=\"$PYTHON_LIBRARY\" $CMAKE_ARGS"
COMMAND="cd /pulsar/pulsar-client-cpp \\
&& apt install -y python3-dev \\
&& cmake . $CMAKE_ARGS \\
&& make check-format \\
&& make -j8"

DOCKER_CMD="docker run -i ${VOLUME_OPTION} ${IMAGE}"

Expand Down
11 changes: 5 additions & 6 deletions pulsar-client-cpp/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
endif()

# Newer boost versions don't use the -mt suffix
if (NOT DEFINED ${Boost_PYTHON27-MT_LIBRARY})
set(Boost_PYTHON27-MT_LIBRARY ${Boost_PYTHON27_LIBRARY})
endif()

if (NOT DEFINED ${Boost_PYTHON37-MT_LIBRARY})
set(Boost_PYTHON37-MT_LIBRARY ${Boost_PYTHON37_LIBRARY})
endif()
Expand All @@ -50,13 +46,16 @@ endif()

# Try all possible boost-python variable namings
set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY}
${Boost_PYTHON27-MT_LIBRARY} ${Boost_PYTHON37-MT_LIBRARY}
${Boost_PYTHON-PY35_LIBRARY}
${Boost_PYTHON-PY36_LIBRARY}
${Boost_PYTHON-PY37_LIBRARY}
${Boost_PYTHON-PY38_LIBRARY}
${Boost_PYTHON37-MT_LIBRARY}
${Boost_PYTHON34_LIBRARY} ${Boost_PYTHON35_LIBRARY}
${Boost_PYTHON36_LIBRARY} ${Boost_PYTHON38_LIBRARY})

if (APPLE)
set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS}
${Boost_PYTHON27-MT_LIBRARY_RELEASE}
${Boost_PYTHON37-MT_LIBRARY_RELEASE}
${Boost_PYTHON38-MT_LIBRARY_RELEASE})
endif()
Expand Down
14 changes: 0 additions & 14 deletions pulsar-client-cpp/python/pkg/osx/vagrant-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@ cd pulsar/pulsar-client-cpp
brew link --force boost
brew link --force protobuf260 || true ## Older images have protobuf 2.6.0 and not linked

# Python 2
brew unlink python
brew unlink boost-python3
brew link --force python@2
brew link --force boost-python

cmake . -DBUILD_TESTS=OFF \
-DLINK_STATIC=ON \
-DPYTHON_LIBRARY=/usr/local/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib
make _pulsar -j8
pushd python
python2 setup.py bdist_wheel
popd

#### Python 3
brew unlink python@2
brew unlink boost-python
Expand Down