Skip to content
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

Use setuptools instead of distutils #429

Merged
merged 1 commit into from
May 9, 2020
Merged

Use setuptools instead of distutils #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion combined_robot_hw/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>combined_robot_hw</name>
<version>0.19.0</version>
<description>Combined Robot HW class.</description>
Expand Down
6 changes: 5 additions & 1 deletion combined_robot_hw_tests/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>combined_robot_hw_tests</name>
<version>0.19.0</version>
<description>Tests for the combined Robot HW class.</description>
Expand Down
6 changes: 5 additions & 1 deletion controller_interface/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>controller_interface</name>
<version>0.19.0</version>
<description>Interface base class for controllers.</description>
Expand Down
8 changes: 7 additions & 1 deletion controller_manager/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>controller_manager</name>
<version>0.19.0</version>
<description>The controller manager.</description>
Expand All @@ -17,6 +21,8 @@
<author>Mathias Lüdtke</author>

<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>

<depend>roscpp</depend>

Expand Down
14 changes: 6 additions & 8 deletions controller_manager/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#!/usr/bin/env python

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
setup_args = generate_distutils_setup(
packages=['controller_manager'],
package_dir={'': 'src'})
d = generate_distutils_setup(
packages=['controller_manager'],
package_dir={'': 'src'}
)

setup(**setup_args)
setup(**d)
8 changes: 7 additions & 1 deletion controller_manager_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>controller_manager_msgs</name>
<version>0.19.0</version>
<description>Messages and services for the controller manager.</description>
Expand All @@ -16,6 +20,8 @@
<author>Wim Meeussen</author>

<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>

<depend>std_msgs</depend>

Expand Down
14 changes: 6 additions & 8 deletions controller_manager_msgs/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#!/usr/bin/env python

from distutils.core import setup
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

# fetch values from package.xml
setup_args = generate_distutils_setup(
packages=['controller_manager_msgs'],
package_dir={'': 'src'})
d = generate_distutils_setup(
packages=['controller_manager_msgs'],
package_dir={'': 'src'}
)

setup(**setup_args)
setup(**d)
8 changes: 7 additions & 1 deletion controller_manager_tests/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>controller_manager_tests</name>
<version>0.19.0</version>
<description>Tests for the controller manager.</description>
Expand All @@ -17,6 +21,8 @@
<author>Adolfo Rodriguez Tsouroukdissian</author>

<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>

<depend>controller_interface</depend> <!-- exec_depend required for plugin -->
<depend>controller_manager</depend>
Expand Down
4 changes: 1 addition & 3 deletions controller_manager_tests/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/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: 5 additions & 1 deletion hardware_interface/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>hardware_interface</name>
<version>0.19.0</version>
<description>Hardware Interface base class.</description>
Expand Down
6 changes: 5 additions & 1 deletion joint_limits_interface/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>joint_limits_interface</name>
<version>0.19.0</version>
<description>Interface for enforcing joint limits.</description>
Expand Down
6 changes: 5 additions & 1 deletion ros_control/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>ros_control</name>
<version>0.19.0</version>
<description>A set of packages that include controller interfaces, controller managers, transmissions and hardware_interfaces.</description>
Expand Down
8 changes: 7 additions & 1 deletion rqt_controller_manager/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rqt_controller_manager</name>
<version>0.19.0</version>
<description>Graphical frontend for interacting with the controller manager.</description>
Expand All @@ -17,6 +21,8 @@
<author email="[email protected]">Adolfo Rodríguez Tsouroukdissian</author>

<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>

<exec_depend>controller_manager_msgs</exec_depend>
<exec_depend>rospy</exec_depend>
Expand Down
4 changes: 1 addition & 3 deletions rqt_controller_manager/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/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: 5 additions & 1 deletion transmission_interface/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<package format="2">
<?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>transmission_interface</name>
<version>0.19.0</version>
<description>Transmission Interface.</description>
Expand Down