This is an automated email from the ASF dual-hosted git repository. cml pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
commit 0693a8a8d985bbeb9897d19a3e5d4aabe4aa4216 Author: Kim van der Riet <[email protected]> AuthorDate: Wed Feb 5 08:58:29 2020 +0100 QPIDIT-140: Fix for python pointing to Python 3.x in Fedora 31. Changed all references to python to python2. --- CMakeLists.txt | 8 ++++---- src/python/qpid_interop_test/qit_shim.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1a445a..8baa4ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ MACRO (find_python endif () ENDMACRO () -find_python(python "PYTHON2_FOUND" "PYTHON2_VER" "PYTHON2_SITE_DIR_NAME") +find_python(python2 "PYTHON2_FOUND" "PYTHON2_VER" "PYTHON2_SITE_DIR_NAME") # Python2 is required to run main QIT program if (NOT PYTHON2_FOUND) message(STATUS "ERROR: Python 2.x not found, but is required") @@ -165,10 +165,10 @@ endif() configure_file(config.sh.in config.sh @ONLY) # Install files using python setup.py -install(CODE "MESSAGE(STATUS \"Python 2 install dir: ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON2_DIR_NAME}/site-packages/qpid_interop_test/\")") -install(CODE "execute_process(COMMAND python setup.py install --prefix ${CMAKE_INSTALL_PREFIX} +install(CODE "MESSAGE(STATUS \"Python 2 install dir: ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON2_SITE_DIR_NAME}/site-packages/qpid_interop_test/\")") +install(CODE "execute_process(COMMAND python2 setup.py install --prefix ${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ../)") -install(CODE "MESSAGE(STATUS \"Python 3 install dir: ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON3_DIR_NAME}/site-packages/qpid_interop_test/\")") +install(CODE "MESSAGE(STATUS \"Python 3 install dir: ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON3_SITE_DIR_NAME}/site-packages/qpid_interop_test/\")") install(CODE "execute_process(COMMAND python3 setup.py install --prefix ${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ../)") install(FILES build/config.sh diff --git a/src/python/qpid_interop_test/qit_shim.py b/src/python/qpid_interop_test/qit_shim.py index c1ade1d..52f5674 100644 --- a/src/python/qpid_interop_test/qit_shim.py +++ b/src/python/qpid_interop_test/qit_shim.py @@ -126,8 +126,8 @@ class ProtonPython2Shim(Shim): NAME = 'ProtonPython2' def __init__(self, sender_shim, receiver_shim): super(ProtonPython2Shim, self).__init__(sender_shim, receiver_shim) - self.send_params = ['python', self.sender_shim] - self.receive_params = ['python', self.receiver_shim] + self.send_params = ['python2', self.sender_shim] + self.receive_params = ['python2', self.receiver_shim] class ProtonPython3Shim(Shim): --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
