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.

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

[noetic port] Use setuptools instead of distutils #161

Merged
merged 2 commits into from
Apr 23, 2020

Conversation

seanyen
Copy link
Contributor

@seanyen seanyen commented Mar 12, 2020

This pull request is to apply the noetic migration by this ROS Wiki: http://wiki.ros.org/noetic/Migration

P.S. Updating it to setuptools helps packaging system such like conda packages passing --single-version-externally-managed to avoid Python egg generation.

@seanyen
Copy link
Contributor Author

seanyen commented Mar 12, 2020

@sloretz @mjcarroll This is ready for review and merge. Thanks.

@@ -20,6 +22,8 @@
<author>Mikael Arguedas</author>

<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is targeting a noetic-devel branch, there's no need to include a <buildtool_depend> for either ROS_PYTHON_VERSION 2 or 3. As of ros/catkin#1048 catkin exports the dependency on python3-setuptools for the convenience of all downstream python packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to know that. I reverted the package.xml changes.

@mjcarroll mjcarroll merged commit eff8fbd into ros:noetic-devel Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants