From b698ef5329de45a167a451206a46ec2075350921 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Thu, 3 Oct 2024 14:16:56 -0400 Subject: [PATCH] Stop using python_cmake_module. (#536) We really don't need it anymore, and can just use the builtin find_package(Python3). Signed-off-by: Chris Lalancette --- test_cli/CMakeLists.txt | 13 ++----------- test_cli/package.xml | 1 - test_cli_remapping/CMakeLists.txt | 13 ++----------- test_cli_remapping/package.xml | 1 - test_communication/CMakeLists.txt | 16 ---------------- test_communication/package.xml | 1 - 6 files changed, 4 insertions(+), 41 deletions(-) diff --git a/test_cli/CMakeLists.txt b/test_cli/CMakeLists.txt index 864ad4ba..a5bd287a 100644 --- a/test_cli/CMakeLists.txt +++ b/test_cli/CMakeLists.txt @@ -5,16 +5,6 @@ project(test_cli) find_package(ament_cmake_auto REQUIRED) if(BUILD_TESTING) - # Provides PYTHON_EXECUTABLE_DEBUG - find_package(python_cmake_module REQUIRED) - find_package(PythonExtra REQUIRED) - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}") - endif() - endif() - # Default to C++17 if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) @@ -29,6 +19,8 @@ if(BUILD_TESTING) find_package(ament_cmake_pytest REQUIRED) find_package(rclcpp REQUIRED) + find_package(Python3 REQUIRED COMPONENTS Interpreter) + ament_lint_auto_find_test_dependencies() add_executable(initial_params_rclcpp @@ -39,7 +31,6 @@ if(BUILD_TESTING) ament_add_pytest_test(test_params_yaml test/test_params_yaml.py - PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}" ENV INITIAL_PARAMS_RCLCPP=$ INITIAL_PARAMS_RCLPY=${CMAKE_CURRENT_LIST_DIR}/test/initial_params.py diff --git a/test_cli/package.xml b/test_cli/package.xml index f8aaed9c..2724e682 100644 --- a/test_cli/package.xml +++ b/test_cli/package.xml @@ -17,7 +17,6 @@ William Woodall ament_cmake_auto - python_cmake_module ament_cmake diff --git a/test_cli_remapping/CMakeLists.txt b/test_cli_remapping/CMakeLists.txt index 8a05b86e..ced3fa50 100644 --- a/test_cli_remapping/CMakeLists.txt +++ b/test_cli_remapping/CMakeLists.txt @@ -5,16 +5,6 @@ project(test_cli_remapping) find_package(ament_cmake_auto REQUIRED) if(BUILD_TESTING) - # Provides PYTHON_EXECUTABLE_DEBUG - find_package(python_cmake_module REQUIRED) - find_package(PythonExtra REQUIRED) - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}") - endif() - endif() - # Default to C++17 if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) @@ -30,6 +20,8 @@ if(BUILD_TESTING) find_package(rclcpp REQUIRED) find_package(test_msgs REQUIRED) + find_package(Python3 REQUIRED COMPONENTS Interpreter) + ament_lint_auto_find_test_dependencies() add_executable(name_maker_rclcpp @@ -42,7 +34,6 @@ if(BUILD_TESTING) add_launch_test( test/test_cli_remapping.py TARGET test_cli_remapping - PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}" ENV NAME_MAKER_RCLCPP=$ NAME_MAKER_RCLPY=${CMAKE_CURRENT_SOURCE_DIR}/test/name_maker.py diff --git a/test_cli_remapping/package.xml b/test_cli_remapping/package.xml index 297da30d..a275e14a 100644 --- a/test_cli_remapping/package.xml +++ b/test_cli_remapping/package.xml @@ -17,7 +17,6 @@ William Woodall ament_cmake_auto - python_cmake_module ament_cmake diff --git a/test_communication/CMakeLists.txt b/test_communication/CMakeLists.txt index 6fda4397..beecaf63 100644 --- a/test_communication/CMakeLists.txt +++ b/test_communication/CMakeLists.txt @@ -75,10 +75,6 @@ if(BUILD_TESTING) find_package(launch_testing_ament_cmake REQUIRED) - # Provides PYTHON_EXECUTABLE_DEBUG - find_package(python_cmake_module REQUIRED) - find_package(PythonExtra REQUIRED) - # get the rmw implementations ahead of time find_package(rmw_implementation_cmake REQUIRED) get_available_rmw_implementations(rmw_implementations2) @@ -241,7 +237,6 @@ if(BUILD_TESTING) add_launch_test( "${CMAKE_CURRENT_BINARY_DIR}/test_publisher_subscriber${suffix}_$.py" TARGET test_publisher_subscriber${suffix} - PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}" APPEND_LIBRARY_DIRS "${append_library_dirs}" TIMEOUT ${timeout} ${SKIP_TEST}) @@ -283,7 +278,6 @@ if(BUILD_TESTING) add_launch_test( "${CMAKE_CURRENT_BINARY_DIR}/test_requester_replier${suffix}_$.py" TARGET test_requester_replier${suffix} - PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}" APPEND_LIBRARY_DIRS "${append_library_dirs}" TIMEOUT ${timeout} ${SKIP_TEST}) @@ -321,7 +315,6 @@ if(BUILD_TESTING) add_launch_test( "${CMAKE_CURRENT_BINARY_DIR}/test_action_client_server${suffix}_$.py" TARGET test_action_client_server${suffix} - PYTHON_EXECUTABLE "${_PYTHON_EXECUTABLE}" APPEND_LIBRARY_DIRS "${append_library_dirs}" TIMEOUT ${timeout} ${SKIP_TEST}) @@ -335,7 +328,6 @@ if(BUILD_TESTING) endmacro() macro(configure_template _client_library1 _client_library2) - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}") set(_client_library1 "${_client_library1}") set(_client_library2 "${_client_library2}") set(TEST_PUBLISHER_RCL "${_client_library1}") @@ -351,14 +343,6 @@ if(BUILD_TESTING) set(suffix "__${_client_library1}__${_client_library2}") endif() - if(_client_library1 STREQUAL "rclpy" OR _client_library2 STREQUAL "rclpy") - if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_DEBUG}") - endif() - endif() - endif() - if(_client_library1 STREQUAL "rclpy") set(TEST_PUBLISHER_EXECUTABLE "${CMAKE_CURRENT_SOURCE_DIR}/test/publisher_py.py") set(TEST_REQUESTER_EXECUTABLE "${CMAKE_CURRENT_SOURCE_DIR}/test/requester_py.py") diff --git a/test_communication/package.xml b/test_communication/package.xml index 58fe6ef3..a279c6bc 100644 --- a/test_communication/package.xml +++ b/test_communication/package.xml @@ -22,7 +22,6 @@ rosidl_default_generators ament_cmake_auto - python_cmake_module rosidl_default_runtime