Issue #910 - Use Python 3.9 in RPM and build own Proton Python

Author: jiridanek

CMakeLists.txt

@@ -121,7 +121,7 @@ include(CMakeDependentOption)
 ##
 find_library(rt_lib rt)
 
-find_package(Python 3.6.8 REQUIRED COMPONENTS Interpreter Development)
+find_package(Python 3.9 REQUIRED COMPONENTS Interpreter Development)
 find_package(Threads REQUIRED)
 find_package(Proton 0.38.0 REQUIRED COMPONENTS Core Proactor Tls)
 message(STATUS "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" )

packaging/skupper-router.spec.rpkg

@@ -39,6 +39,7 @@
 %global proton_vendored_version 0.38.0
 %define proton_install_prefix %{_builddir}/qpid-proton-%{proton_vendored_version}/install
 
+%global python_minimum_version 3.9.0
 %global proton_minimum_version 0.34.0
 %global libwebsockets_minimum_version 3.0.1
 %global libnghttp2_minimum_version 1.33.0
@@ -51,7 +52,8 @@ License:       ASL 2.0
 URL:           https://skupper.io
 VCS:           {{{ git_dir_vcs }}}
 
-Requires: python3
+%{?fedora:Requires: python3 >= %{python_minimum_version}}
+%{?rhel:Requires: python39 >= %{python_minimum_version}}
 Requires: skupper-router-common == %{version}
 Requires: libwebsockets >= %{libwebsockets_minimum_version}
 Requires: libnghttp2 >= %{libnghttp2_minimum_version}
@@ -63,19 +65,28 @@ BuildRequires: gcc-c++
 BuildRequires: cmake
 
 # skupper-router requirements
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
+%{?fedora:BuildRequires: python3-devel >= %{python_minimum_version}}
+%{?fedora:BuildRequires: python3-setuptools}
+%{?fedora:BuildRequires: python3-pip}
+# without wheel the installed files lack `python_qpid_proton-0.37.0.dist-info`
+%{?fedora:BuildRequires: python3-wheel}
+%{?rhel:BuildRequires: python39-devel >= %{python_minimum_version}}
+%{?rhel:BuildRequires: python39-setuptools}
+%{?rhel:BuildRequires: python39-pip}
+%{?rhel:BuildRequires: python39-wheel}
+%{?rhel:BuildRequires: python39-rpm-macros}
 BuildRequires: libwebsockets-devel >= %{libwebsockets_minimum_version}
 BuildRequires: libnghttp2-devel >= %{libnghttp2_minimum_version}
 # man pages --help
 BuildRequires: asciidoc
-BuildRequires: python3-qpid-proton >= %{proton_minimum_version}
 # check ctest
 BuildRequires: cyrus-sasl-plain
 
 # proton-c requirements
 BuildRequires: openssl-devel
 BuildRequires: cyrus-sasl-devel
+# python-qpid-proton requirements
+BuildRequires: swig
 
 # skupper-router sources
 Source0: {{{ git_dir_pack }}}
@@ -97,7 +108,8 @@ cd %{_builddir}/qpid-proton-%{proton_vendored_version}
     -DCMAKE_C_FLAGS="$CFLAGS -Wno-error=deprecated-declarations" \
     -DBUILD_EXAMPLES=OFF \
     -DBUILD_TESTING=OFF \
-    -DBUILD_BINDINGS=OFF \
+    -DBUILD_BINDINGS=python \
+    -DPython_EXECUTABLE=%{python3} \
     -DBUILD_TLS=ON -DSSL_IMPL=openssl \
     -DBUILD_STATIC_LIBS=ON \
     -DCMAKE_POLICY_DEFAULT_CMP0069=NEW -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
@@ -106,6 +118,8 @@ cd %{_builddir}/qpid-proton-%{proton_vendored_version}
 %__cmake --install "%{__cmake_builddir}"
 
 cd %{_builddir}/skupper-router
+# for `import proton` when rendering sktools --help to manpages
+source %{_builddir}/qpid-proton-%{proton_vendored_version}/%{__cmake_builddir}/config.sh
 %cmake \
     -DVERSION="%{version}" \
     -DPython_EXECUTABLE=%{python3} \
@@ -115,12 +129,14 @@ cd %{_builddir}/skupper-router
 %cmake_build --target all --target man
 
 %install
+# this will install all-in-one cpython .so module with proton inside
+%python3 -m pip install --target "%{buildroot}/usr/lib/skupper-router/python/" %{_builddir}/qpid-proton-%{proton_vendored_version}/%{__cmake_builddir}/python/pkgs/python-qpid-proton-*.tar.gz
 cd %{_builddir}/skupper-router
 %cmake_install
 
 %check
-cd %{_builddir}/skupper-router
-%ctest
+cd %{_builddir}/skupper-router/%{__cmake_builddir}
+PYTHONPATH="%{buildroot}/usr/lib/skupper-router/python/" %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags}
 
 %files
 /usr/sbin/skrouterd
@@ -140,21 +156,26 @@ cd %{_builddir}/skupper-router
 
 %package common
 Summary:  Internal code shared between the router daemon and the tools
-BuildArch: noarch
+# BuildArch: noarch # due to binary proton
 Requires: python3
-Requires: python3-qpid-proton >= %{proton_minimum_version}
 
 %description common
 %{summary}.
 
 %files common
+# -tools and -tests depend on this
+/usr/lib/skupper-router/python/cproton.py
+/usr/lib/skupper-router/python/proton
+/usr/lib/skupper-router/python/python_qpid_proton-*.dist-info
+/usr/lib/skupper-router/python/_cproton.cpython-*-*-linux-gnu.so
+/usr/lib/skupper-router/python/__pycache__/cproton.cpython-*.pyc
+# skupper-router, -tools, and -tests depend on this
 /usr/lib/skupper-router/python/skupper_router_internal/
 
 %package tools
 Summary:  The skstat and skmanage tools for skrouterd
 BuildArch: noarch
 Requires: python3
-Requires: python3-qpid-proton >= %{proton_minimum_version}
 Requires: skupper-router-common == %{version}
 Requires: cyrus-sasl-plain
 Requires: cyrus-sasl-gssapi
@@ -172,7 +193,6 @@ Requires: cyrus-sasl-gssapi
 %package tests
 Summary:  Tests for the skupper router and the tools
 Requires: python3
-Requires: python3-qpid-proton >= %{proton_minimum_version}
 Requires: skupper-router == %{version}
 Requires: skupper-router-tools == %{version}
 Requires: cyrus-sasl-plain