From b7462982b731b4906767ff0ec8a4866f3961dea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darko=20Luki=C4=87?= Date: Mon, 16 Aug 2021 14:35:20 +0200 Subject: [PATCH] Fix Rolling warnings and `ament_python_install_package` (#266) * Fix Rolling warnings and `ament_python_install_package` * Add to CI --- .github/workflows/test.yml | 2 +- webots_ros2/setup.cfg | 4 ++-- webots_ros2_abb/setup.cfg | 4 ++-- webots_ros2_core/setup.cfg | 4 ++-- webots_ros2_demos/setup.cfg | 4 ++-- webots_ros2_driver/CMakeLists.txt | 6 +++--- webots_ros2_driver/src/PythonPlugin.cpp | 2 +- webots_ros2_epuck/setup.cfg | 4 ++-- webots_ros2_examples/setup.cfg | 4 ++-- webots_ros2_importer/setup.cfg | 4 ++-- webots_ros2_mavic/setup.cfg | 4 ++-- webots_ros2_tesla/setup.cfg | 4 ++-- webots_ros2_tiago/setup.cfg | 4 ++-- webots_ros2_turtlebot/setup.cfg | 4 ++-- .../webots_ros2_turtlebot/plugin_example.py | 2 +- webots_ros2_tutorials/setup.cfg | 4 ++-- webots_ros2_universal_robot/setup.cfg | 4 ++-- webots_ros2_ur_e_description/setup.cfg | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4be89fd22..b84a8e63c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: ROS_REPO: [main, testing] - ROS_DISTRO: [foxy] + ROS_DISTRO: [foxy, rolling] runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 diff --git a/webots_ros2/setup.cfg b/webots_ros2/setup.cfg index 4da31ac2f..83c018def 100644 --- a/webots_ros2/setup.cfg +++ b/webots_ros2/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2 +script_dir=$base/lib/webots_ros2 [install] -install-scripts=$base/lib/webots_ros2 +install_scripts=$base/lib/webots_ros2 diff --git a/webots_ros2_abb/setup.cfg b/webots_ros2_abb/setup.cfg index 792f3e4cf..211969a6a 100644 --- a/webots_ros2_abb/setup.cfg +++ b/webots_ros2_abb/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_abb +script_dir=$base/lib/webots_ros2_abb [install] -install-scripts=$base/lib/webots_ros2_abb +install_scripts=$base/lib/webots_ros2_abb diff --git a/webots_ros2_core/setup.cfg b/webots_ros2_core/setup.cfg index 463257c92..66da46018 100644 --- a/webots_ros2_core/setup.cfg +++ b/webots_ros2_core/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_core +script_dir=$base/lib/webots_ros2_core [install] -install-scripts=$base/lib/webots_ros2_core +install_scripts=$base/lib/webots_ros2_core diff --git a/webots_ros2_demos/setup.cfg b/webots_ros2_demos/setup.cfg index 946d51a4e..63581cc29 100644 --- a/webots_ros2_demos/setup.cfg +++ b/webots_ros2_demos/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_demos +script_dir=$base/lib/webots_ros2_demos [install] -install-scripts=$base/lib/webots_ros2_demos +install_scripts=$base/lib/webots_ros2_demos diff --git a/webots_ros2_driver/CMakeLists.txt b/webots_ros2_driver/CMakeLists.txt index 697873956..e8ddd3e3d 100644 --- a/webots_ros2_driver/CMakeLists.txt +++ b/webots_ros2_driver/CMakeLists.txt @@ -67,7 +67,7 @@ else() ) endif() -ament_python_install_package(${PROJECT_NAME}/webots +ament_python_install_package(${PROJECT_NAME}_webots PACKAGE_DIR ${WEBOTS_LIB_BASE}/python38) add_executable(driver @@ -158,13 +158,13 @@ if (MSVC OR MSYS OR MINGW OR WIN32) # Windows requires the C++ library to be placed with the Python module install( FILES "${WEBOTS_LIB_BASE}/${CMAKE_SHARED_LIBRARY_PREFIX}CppController${CMAKE_SHARED_LIBRARY_SUFFIX}" - DESTINATION "${PYTHON_INSTALL_DIR}/${PROJECT_NAME}/webots/" + DESTINATION "${PYTHON_INSTALL_DIR}/${PROJECT_NAME}_webots/" ) else() install( DIRECTORY ${WEBOTS_LIB_BASE}/ DESTINATION lib - FILES_MATCHING + PATTERN "python*" EXCLUDE PATTERN "*Controller*" PATTERN "*CppController*" PATTERN "*car*" diff --git a/webots_ros2_driver/src/PythonPlugin.cpp b/webots_ros2_driver/src/PythonPlugin.cpp index 67ef3ab6d..d323d7a1c 100644 --- a/webots_ros2_driver/src/PythonPlugin.cpp +++ b/webots_ros2_driver/src/PythonPlugin.cpp @@ -29,7 +29,7 @@ namespace webots_ros2_driver PyObject *pyWebotsExtraModuleSource = Py_CompileString( R"EOT( -from webots_ros2_driver.webots.controller import Supervisor +from webots_ros2_driver_webots.controller import Supervisor class WebotsNode: def __init__(self): diff --git a/webots_ros2_epuck/setup.cfg b/webots_ros2_epuck/setup.cfg index f9663b90c..b34b2e0d4 100644 --- a/webots_ros2_epuck/setup.cfg +++ b/webots_ros2_epuck/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_epuck +script_dir=$base/lib/webots_ros2_epuck [install] -install-scripts=$base/lib/webots_ros2_epuck +install_scripts=$base/lib/webots_ros2_epuck diff --git a/webots_ros2_examples/setup.cfg b/webots_ros2_examples/setup.cfg index 0389dbf80..1da7b49d6 100644 --- a/webots_ros2_examples/setup.cfg +++ b/webots_ros2_examples/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_examples +script_dir=$base/lib/webots_ros2_examples [install] -install-scripts=$base/lib/webots_ros2_examples +install_scripts=$base/lib/webots_ros2_examples diff --git a/webots_ros2_importer/setup.cfg b/webots_ros2_importer/setup.cfg index 154d5afed..5dfbea228 100644 --- a/webots_ros2_importer/setup.cfg +++ b/webots_ros2_importer/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_importer +script_dir=$base/lib/webots_ros2_importer [install] -install-scripts=$base/lib/webots_ros2_importer +install_scripts=$base/lib/webots_ros2_importer diff --git a/webots_ros2_mavic/setup.cfg b/webots_ros2_mavic/setup.cfg index 9a9f610eb..452655cf9 100644 --- a/webots_ros2_mavic/setup.cfg +++ b/webots_ros2_mavic/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_mavic +script_dir=$base/lib/webots_ros2_mavic [install] -install-scripts=$base/lib/webots_ros2_mavic +install_scripts=$base/lib/webots_ros2_mavic diff --git a/webots_ros2_tesla/setup.cfg b/webots_ros2_tesla/setup.cfg index 8ffe1b838..3bc4160a0 100644 --- a/webots_ros2_tesla/setup.cfg +++ b/webots_ros2_tesla/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_tesla +script_dir=$base/lib/webots_ros2_tesla [install] -install-scripts=$base/lib/webots_ros2_tesla +install_scripts=$base/lib/webots_ros2_tesla diff --git a/webots_ros2_tiago/setup.cfg b/webots_ros2_tiago/setup.cfg index 0980b9c60..c610b9613 100644 --- a/webots_ros2_tiago/setup.cfg +++ b/webots_ros2_tiago/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_tiago +script_dir=$base/lib/webots_ros2_tiago [install] -install-scripts=$base/lib/webots_ros2_tiago +install_scripts=$base/lib/webots_ros2_tiago diff --git a/webots_ros2_turtlebot/setup.cfg b/webots_ros2_turtlebot/setup.cfg index 35f690ff6..8d96fc0e9 100644 --- a/webots_ros2_turtlebot/setup.cfg +++ b/webots_ros2_turtlebot/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_turtlebot +script_dir=$base/lib/webots_ros2_turtlebot [install] -install-scripts=$base/lib/webots_ros2_turtlebot +install_scripts=$base/lib/webots_ros2_turtlebot diff --git a/webots_ros2_turtlebot/webots_ros2_turtlebot/plugin_example.py b/webots_ros2_turtlebot/webots_ros2_turtlebot/plugin_example.py index 282a50a4b..e6701378d 100644 --- a/webots_ros2_turtlebot/webots_ros2_turtlebot/plugin_example.py +++ b/webots_ros2_turtlebot/webots_ros2_turtlebot/plugin_example.py @@ -14,7 +14,7 @@ """A simple dummy plugin that demonstrates the usage of Python plugins.""" -from webots_ros2_driver.webots.controller import Node +from webots_ros2_driver_webots.controller import Node from std_msgs.msg import Float32 import rclpy import rclpy.node diff --git a/webots_ros2_tutorials/setup.cfg b/webots_ros2_tutorials/setup.cfg index 401c2a9d7..977b8625e 100644 --- a/webots_ros2_tutorials/setup.cfg +++ b/webots_ros2_tutorials/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_tutorials +script_dir=$base/lib/webots_ros2_tutorials [install] -install-scripts=$base/lib/webots_ros2_tutorials +install_scripts=$base/lib/webots_ros2_tutorials diff --git a/webots_ros2_universal_robot/setup.cfg b/webots_ros2_universal_robot/setup.cfg index fd2682dcb..c3a218a47 100644 --- a/webots_ros2_universal_robot/setup.cfg +++ b/webots_ros2_universal_robot/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_universal_robot +script_dir=$base/lib/webots_ros2_universal_robot [install] -install-scripts=$base/lib/webots_ros2_universal_robot +install_scripts=$base/lib/webots_ros2_universal_robot diff --git a/webots_ros2_ur_e_description/setup.cfg b/webots_ros2_ur_e_description/setup.cfg index 487fb8928..0c37d51ff 100644 --- a/webots_ros2_ur_e_description/setup.cfg +++ b/webots_ros2_ur_e_description/setup.cfg @@ -1,4 +1,4 @@ [develop] -script-dir=$base/lib/webots_ros2_ur_e_description +script_dir=$base/lib/webots_ros2_ur_e_description [install] -install-scripts=$base/lib/webots_ros2_ur_e_description +install_scripts=$base/lib/webots_ros2_ur_e_description