From 194e0c9e57d849b057069e3d2b5ab4493b72494a Mon Sep 17 00:00:00 2001 From: Arne Hitzmann Date: Sat, 4 Mar 2023 11:13:45 +0900 Subject: [PATCH 1/2] updated package.xml to format version 3 --- rosserial/package.xml | 8 ++++---- rosserial_arduino/package.xml | 14 +++++++------- rosserial_chibios/package.xml | 4 ++-- rosserial_client/package.xml | 2 +- rosserial_embeddedlinux/package.xml | 6 +++--- rosserial_mbed/package.xml | 10 +++++----- rosserial_msgs/package.xml | 4 ++-- rosserial_python/package.xml | 10 +++++----- rosserial_server/package.xml | 2 +- rosserial_test/package.xml | 2 +- rosserial_tivac/package.xml | 6 +++--- rosserial_vex_cortex/package.xml | 8 ++++---- rosserial_vex_v5/package.xml | 8 ++++---- rosserial_windows/package.xml | 10 +++++----- rosserial_xbee/package.xml | 12 ++++++------ 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/rosserial/package.xml b/rosserial/package.xml index f911d3fe1..74b27a684 100644 --- a/rosserial/package.xml +++ b/rosserial/package.xml @@ -1,4 +1,4 @@ - + rosserial 0.9.2 @@ -12,9 +12,9 @@ catkin - rosserial_msgs - rosserial_client - rosserial_python + rosserial_msgs + rosserial_client + rosserial_python diff --git a/rosserial_arduino/package.xml b/rosserial_arduino/package.xml index 763020786..5a64701e8 100644 --- a/rosserial_arduino/package.xml +++ b/rosserial_arduino/package.xml @@ -1,4 +1,4 @@ - + rosserial_arduino 0.9.2 @@ -15,10 +15,10 @@ message_generation - arduino-core - rospy - rosserial_msgs - rosserial_client - message_runtime - rosserial_python + arduino-core + rospy + rosserial_msgs + rosserial_client + message_runtime + rosserial_python diff --git a/rosserial_chibios/package.xml b/rosserial_chibios/package.xml index e981f6c15..04b58e935 100644 --- a/rosserial_chibios/package.xml +++ b/rosserial_chibios/package.xml @@ -1,4 +1,4 @@ - + rosserial_chibios 0.9.2 @@ -11,5 +11,5 @@ catkin - rosserial_client + rosserial_client diff --git a/rosserial_client/package.xml b/rosserial_client/package.xml index f2d6d0623..987109cb7 100644 --- a/rosserial_client/package.xml +++ b/rosserial_client/package.xml @@ -1,4 +1,4 @@ - + rosserial_client 0.9.2 diff --git a/rosserial_embeddedlinux/package.xml b/rosserial_embeddedlinux/package.xml index 00fc1afd3..ab14d9be4 100644 --- a/rosserial_embeddedlinux/package.xml +++ b/rosserial_embeddedlinux/package.xml @@ -1,4 +1,4 @@ - + rosserial_embeddedlinux 0.9.2 @@ -14,6 +14,6 @@ rosserial_client - rospy - rosserial_msgs + rospy + rosserial_msgs diff --git a/rosserial_mbed/package.xml b/rosserial_mbed/package.xml index 50331b404..c330b968b 100644 --- a/rosserial_mbed/package.xml +++ b/rosserial_mbed/package.xml @@ -1,4 +1,4 @@ - + rosserial_mbed 0.9.2 @@ -13,10 +13,10 @@ message_generation - rospy - rosserial_msgs - rosserial_client - message_runtime + rospy + rosserial_msgs + rosserial_client + message_runtime diff --git a/rosserial_msgs/package.xml b/rosserial_msgs/package.xml index 9f8ac6d2f..22036587b 100644 --- a/rosserial_msgs/package.xml +++ b/rosserial_msgs/package.xml @@ -1,4 +1,4 @@ - + rosserial_msgs 0.9.2 @@ -14,5 +14,5 @@ message_generation - message_runtime + message_runtime diff --git a/rosserial_python/package.xml b/rosserial_python/package.xml index e5a4f9821..8dbed371c 100644 --- a/rosserial_python/package.xml +++ b/rosserial_python/package.xml @@ -1,4 +1,4 @@ - + rosserial_python 0.9.2 @@ -12,8 +12,8 @@ catkin - rospy - rosserial_msgs - diagnostic_msgs - python3-serial + rospy + rosserial_msgs + diagnostic_msgs + python3-serial diff --git a/rosserial_server/package.xml b/rosserial_server/package.xml index df73c3923..7744a1fbe 100644 --- a/rosserial_server/package.xml +++ b/rosserial_server/package.xml @@ -1,5 +1,5 @@ - + rosserial_server 0.9.2 diff --git a/rosserial_test/package.xml b/rosserial_test/package.xml index 2f9d6b698..2953a7430 100644 --- a/rosserial_test/package.xml +++ b/rosserial_test/package.xml @@ -1,5 +1,5 @@ - + rosserial_test 0.9.2 diff --git a/rosserial_tivac/package.xml b/rosserial_tivac/package.xml index d922ba732..e0864cb8f 100644 --- a/rosserial_tivac/package.xml +++ b/rosserial_tivac/package.xml @@ -1,4 +1,4 @@ - + rosserial_tivac 0.9.2 @@ -13,8 +13,8 @@ catkin - rosserial_msgs - rosserial_client + rosserial_msgs + rosserial_client diff --git a/rosserial_vex_cortex/package.xml b/rosserial_vex_cortex/package.xml index 9b788a614..4d98027e6 100644 --- a/rosserial_vex_cortex/package.xml +++ b/rosserial_vex_cortex/package.xml @@ -1,4 +1,4 @@ - + rosserial_vex_cortex 0.9.2 @@ -11,7 +11,7 @@ catkin - rospy - rosserial_client - rosserial_python + rospy + rosserial_client + rosserial_python diff --git a/rosserial_vex_v5/package.xml b/rosserial_vex_v5/package.xml index e763e6dca..f24bc3b57 100644 --- a/rosserial_vex_v5/package.xml +++ b/rosserial_vex_v5/package.xml @@ -1,4 +1,4 @@ - + rosserial_vex_v5 0.9.2 @@ -11,7 +11,7 @@ catkin - rospy - rosserial_client - rosserial_python + rospy + rosserial_client + rosserial_python diff --git a/rosserial_windows/package.xml b/rosserial_windows/package.xml index 4213bb91b..a05106965 100644 --- a/rosserial_windows/package.xml +++ b/rosserial_windows/package.xml @@ -1,4 +1,4 @@ - + rosserial_windows 0.9.2 @@ -17,10 +17,10 @@ nav_msgs rosserial_client - rospy - rosserial_msgs - rosserial_client - message_runtime + rospy + rosserial_msgs + rosserial_client + message_runtime diff --git a/rosserial_xbee/package.xml b/rosserial_xbee/package.xml index e5c71a156..071651bc4 100644 --- a/rosserial_xbee/package.xml +++ b/rosserial_xbee/package.xml @@ -1,4 +1,4 @@ - + rosserial_xbee 0.9.2 @@ -18,10 +18,10 @@ catkin - rospy - rosserial_msgs - diagnostic_msgs - python3-serial - rosserial_python + rospy + rosserial_msgs + diagnostic_msgs + python3-serial + rosserial_python From f742a59be538ae0975418fc410adf8a636e7e8e2 Mon Sep 17 00:00:00 2001 From: Arne Hitzmann Date: Sat, 4 Mar 2023 11:18:15 +0900 Subject: [PATCH 2/2] change to setuptools in accordance with migration guide --- rosserial_arduino/package.xml | 2 ++ rosserial_arduino/setup.py | 2 +- rosserial_client/package.xml | 2 ++ rosserial_client/setup.py | 2 +- rosserial_python/package.xml | 2 ++ rosserial_python/setup.py | 2 +- rosserial_vex_cortex/package.xml | 2 ++ rosserial_vex_cortex/setup.py | 2 +- rosserial_vex_v5/package.xml | 2 ++ rosserial_vex_v5/setup.py | 2 +- rosserial_xbee/package.xml | 2 ++ rosserial_xbee/setup.py | 2 +- 12 files changed, 18 insertions(+), 6 deletions(-) diff --git a/rosserial_arduino/package.xml b/rosserial_arduino/package.xml index 5a64701e8..0d490655a 100644 --- a/rosserial_arduino/package.xml +++ b/rosserial_arduino/package.xml @@ -12,6 +12,8 @@ http://ros.org/wiki/rosserial_arduino catkin + python-setuptools + python3-setuptools message_generation diff --git a/rosserial_arduino/setup.py b/rosserial_arduino/setup.py index 4ef426a5e..baf3f6d55 100644 --- a/rosserial_arduino/setup.py +++ b/rosserial_arduino/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup( diff --git a/rosserial_client/package.xml b/rosserial_client/package.xml index 987109cb7..4d99e63ad 100644 --- a/rosserial_client/package.xml +++ b/rosserial_client/package.xml @@ -12,6 +12,8 @@ http://ros.org/wiki/rosserial_client catkin + python-setuptools + python3-setuptools rosbash rosserial_msgs diff --git a/rosserial_client/setup.py b/rosserial_client/setup.py index 726bfa900..b256ff413 100644 --- a/rosserial_client/setup.py +++ b/rosserial_client/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup( diff --git a/rosserial_python/package.xml b/rosserial_python/package.xml index 8dbed371c..f4043641c 100644 --- a/rosserial_python/package.xml +++ b/rosserial_python/package.xml @@ -11,6 +11,8 @@ http://ros.org/wiki/rosserial_python catkin + python-setuptools + python3-setuptools rospy rosserial_msgs diff --git a/rosserial_python/setup.py b/rosserial_python/setup.py index 1376939f3..a6ee11a39 100644 --- a/rosserial_python/setup.py +++ b/rosserial_python/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup( diff --git a/rosserial_vex_cortex/package.xml b/rosserial_vex_cortex/package.xml index 4d98027e6..3dd5f8803 100644 --- a/rosserial_vex_cortex/package.xml +++ b/rosserial_vex_cortex/package.xml @@ -10,6 +10,8 @@ catkin + python-setuptools + python3-setuptools rospy rosserial_client diff --git a/rosserial_vex_cortex/setup.py b/rosserial_vex_cortex/setup.py index 9598d7c7a..f04774900 100644 --- a/rosserial_vex_cortex/setup.py +++ b/rosserial_vex_cortex/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup( diff --git a/rosserial_vex_v5/package.xml b/rosserial_vex_v5/package.xml index f24bc3b57..4ec678a02 100644 --- a/rosserial_vex_v5/package.xml +++ b/rosserial_vex_v5/package.xml @@ -10,6 +10,8 @@ catkin + python-setuptools + python3-setuptools rospy rosserial_client diff --git a/rosserial_vex_v5/setup.py b/rosserial_vex_v5/setup.py index 1d4501602..00fcf3595 100644 --- a/rosserial_vex_v5/setup.py +++ b/rosserial_vex_v5/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup( diff --git a/rosserial_xbee/package.xml b/rosserial_xbee/package.xml index 071651bc4..fd20a1fd7 100644 --- a/rosserial_xbee/package.xml +++ b/rosserial_xbee/package.xml @@ -17,6 +17,8 @@ http://ros.org/wiki/rosserial_xbee catkin + python-setuptools + python3-setuptools rospy rosserial_msgs diff --git a/rosserial_xbee/setup.py b/rosserial_xbee/setup.py index 385e7f0ba..e8ccc5697 100644 --- a/rosserial_xbee/setup.py +++ b/rosserial_xbee/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup(