Skip to content

Import setup from setuptools instead of distutils.core #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: noetic-devel
Choose a base branch
from
Open

Import setup from setuptools instead of distutils.core #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
194e0c9
updated package.xml to format version 3
arne48 Mar 4, 2023
f742a59
change to setuptools in accordance with migration guide
arne48 Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rosserial/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial</name>
<version>0.9.2</version>
<description>
Expand All @@ -12,9 +12,9 @@

<buildtool_depend>catkin</buildtool_depend>

<run_depend>rosserial_msgs</run_depend>
<run_depend>rosserial_client</run_depend>
<run_depend>rosserial_python</run_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>rosserial_client</exec_depend>
<exec_depend>rosserial_python</exec_depend>

<export>
<metapackage/>
Expand Down
16 changes: 9 additions & 7 deletions rosserial_arduino/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_arduino</name>
<version>0.9.2</version>
<description>
Expand All @@ -12,13 +12,15 @@
<url>http://ros.org/wiki/rosserial_arduino</url>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>

<build_depend>message_generation</build_depend>

<run_depend>arduino-core</run_depend>
<run_depend>rospy</run_depend>
<run_depend>rosserial_msgs</run_depend>
<run_depend>rosserial_client</run_depend>
<run_depend>message_runtime</run_depend>
<run_depend>rosserial_python</run_depend>
<exec_depend>arduino-core</exec_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>rosserial_client</exec_depend>
<exec_depend>message_runtime</exec_depend>
<exec_depend>rosserial_python</exec_depend>
</package>
2 changes: 1 addition & 1 deletion rosserial_arduino/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions rosserial_chibios/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_chibios</name>
<version>0.9.2</version>
<description>
Expand All @@ -11,5 +11,5 @@

<buildtool_depend>catkin</buildtool_depend>

<run_depend>rosserial_client</run_depend>
<exec_depend>rosserial_client</exec_depend>
</package>
4 changes: 3 additions & 1 deletion rosserial_client/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package format="2">
<package format="3">
<name>rosserial_client</name>
<version>0.9.2</version>
<description>
Expand All @@ -12,6 +12,8 @@
<url>http://ros.org/wiki/rosserial_client</url>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
<build_export_depend>rosbash</build_export_depend>

<exec_depend>rosserial_msgs</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion rosserial_client/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
6 changes: 3 additions & 3 deletions rosserial_embeddedlinux/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_embeddedlinux</name>
<version>0.9.2</version>
<description>
Expand All @@ -14,6 +14,6 @@

<build_depend>rosserial_client</build_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_msgs</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_msgs</exec_depend>
</package>
10 changes: 5 additions & 5 deletions rosserial_mbed/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_mbed</name>
<version>0.9.2</version>
<description>
Expand All @@ -13,10 +13,10 @@

<build_depend>message_generation</build_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_msgs</run_depend>
<run_depend>rosserial_client</run_depend>
<run_depend>message_runtime</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>rosserial_client</exec_depend>
<exec_depend>message_runtime</exec_depend>
</package>


4 changes: 2 additions & 2 deletions rosserial_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_msgs</name>
<version>0.9.2</version>
<description>
Expand All @@ -14,5 +14,5 @@

<build_depend>message_generation</build_depend>

<run_depend>message_runtime</run_depend>
<exec_depend>message_runtime</exec_depend>
</package>
12 changes: 7 additions & 5 deletions rosserial_python/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_python</name>
<version>0.9.2</version>
<description>
Expand All @@ -11,9 +11,11 @@
<url>http://ros.org/wiki/rosserial_python</url>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_msgs</run_depend>
<run_depend>diagnostic_msgs</run_depend>
<run_depend>python3-serial</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>diagnostic_msgs</exec_depend>
<exec_depend>python3-serial</exec_depend>
</package>
2 changes: 1 addition & 1 deletion rosserial_python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
2 changes: 1 addition & 1 deletion rosserial_server/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<package format="2">
<package format="3">
<name>rosserial_server</name>
<version>0.9.2</version>
<description>
Expand Down
2 changes: 1 addition & 1 deletion rosserial_test/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<package format="2">
<package format="3">
<name>rosserial_test</name>
<version>0.9.2</version>
<description>
Expand Down
6 changes: 3 additions & 3 deletions rosserial_tivac/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_tivac</name>
<version>0.9.2</version>
<description>
Expand All @@ -13,8 +13,8 @@

<buildtool_depend>catkin</buildtool_depend>

<run_depend>rosserial_msgs</run_depend>
<run_depend>rosserial_client</run_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>rosserial_client</exec_depend>
</package>


10 changes: 6 additions & 4 deletions rosserial_vex_cortex/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_vex_cortex</name>
<version>0.9.2</version>
<description>
Expand All @@ -10,8 +10,10 @@
<!--<url>http://ros.org/wiki/rosserial_arduino</url>-->

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_client</run_depend>
<run_depend>rosserial_python</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_client</exec_depend>
<exec_depend>rosserial_python</exec_depend>
</package>
2 changes: 1 addition & 1 deletion rosserial_vex_cortex/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
10 changes: 6 additions & 4 deletions rosserial_vex_v5/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_vex_v5</name>
<version>0.9.2</version>
<description>
Expand All @@ -10,8 +10,10 @@
<!--<url>http://ros.org/wiki/rosserial_arduino</url>-->

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_client</run_depend>
<run_depend>rosserial_python</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_client</exec_depend>
<exec_depend>rosserial_python</exec_depend>
</package>
2 changes: 1 addition & 1 deletion rosserial_vex_v5/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
10 changes: 5 additions & 5 deletions rosserial_windows/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_windows</name>
<version>0.9.2</version>
<description>
Expand All @@ -17,10 +17,10 @@
<build_depend>nav_msgs</build_depend>
<build_depend>rosserial_client</build_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_msgs</run_depend>
<run_depend>rosserial_client</run_depend>
<run_depend>message_runtime</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>rosserial_client</exec_depend>
<exec_depend>message_runtime</exec_depend>
</package>


14 changes: 8 additions & 6 deletions rosserial_xbee/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>rosserial_xbee</name>
<version>0.9.2</version>
<description>
Expand All @@ -17,11 +17,13 @@
<url>http://ros.org/wiki/rosserial_xbee</url>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>

<run_depend>rospy</run_depend>
<run_depend>rosserial_msgs</run_depend>
<run_depend>diagnostic_msgs</run_depend>
<run_depend>python3-serial</run_depend>
<run_depend>rosserial_python</run_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>rosserial_msgs</exec_depend>
<exec_depend>diagnostic_msgs</exec_depend>
<exec_depend>python3-serial</exec_depend>
<exec_depend>rosserial_python</exec_depend>
</package>

2 changes: 1 addition & 1 deletion rosserial_xbee/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down