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

Fix #78 #79

Merged
merged 2 commits into from
Dec 10, 2020
Merged

Fix #78 #79

merged 2 commits into from
Dec 10, 2020

Conversation

DLu
Copy link
Owner

@DLu DLu commented Dec 2, 2020

Fix for #78

Also adds one check to make sure python3 dependencies won't be added multiple times.

Does this work for you @fmessmer?

@fmessmer
Copy link

fmessmer commented Dec 2, 2020

running this branch, I get the following error:

Traceback (most recent call last):
  File "/home/fxm/projects/default/care-o-bot/src/roscompile/roscompile/scripts/noetic_migration", line 39, in <module>
    existing = manifest.get_packages_by_tag(tag_name)
NameError: name 'manifest' is not defined

@DLu
Copy link
Owner Author

DLu commented Dec 7, 2020

@fmessmer give it one more try?

@fmessmer
Copy link

fmessmer commented Dec 7, 2020

looks good so far

just one more thing I noticed:
when the noetic_migration script add ROS_PYTHON_VERSION-specific dependencies, then the python2-specific dependencies are modified inline while the python3-specific dependencies are appended at the end - this might mess with alphabetical ordering in the dependencies

e.g.

  <exec_depend>actionlib</exec_depend>
  <exec_depend>angles</exec_depend>
  <exec_depend>cob_frame_tracker</exec_depend>
  <exec_depend>cob_twist_controller</exec_depend>
  <exec_depend>joint_state_publisher</exec_depend>
  <exec_depend>mojin_default_robot_config</exec_depend>
  <exec_depend>mojin_manipulation_interface</exec_depend>
  <exec_depend>mojin_moveit_config</exec_depend>
  <exec_depend>mojin_utils</exec_depend>
  <exec_depend>moveit_commander</exec_depend>
  <exec_depend>python-matplotlib</exec_depend>
  <exec_depend>python-six</exec_depend>
  <exec_depend>python-inotify-simple-pip</exec_depend>
  <exec_depend>robot_state_publisher</exec_depend>
  <exec_depend>rospy</exec_depend>
  <exec_depend>rqt_plot</exec_depend>
  <exec_depend>rviz</exec_depend>
  <exec_depend>shape_msgs</exec_depend>
  <exec_depend>std_msgs</exec_depend>
  <exec_depend>tf</exec_depend>
  <exec_depend>tf_conversions</exec_depend>
  <exec_depend>tf2_ros</exec_depend>
  <exec_depend>trajectory_msgs</exec_depend>
  <exec_depend>visualization_msgs</exec_depend>

will be changed to

  <exec_depend>actionlib</exec_depend>
  <exec_depend>angles</exec_depend>
  <exec_depend>cob_frame_tracker</exec_depend>
  <exec_depend>cob_twist_controller</exec_depend>
  <exec_depend>joint_state_publisher</exec_depend>
  <exec_depend>mojin_default_robot_config</exec_depend>
  <exec_depend>mojin_manipulation_interface</exec_depend>
  <exec_depend>mojin_moveit_config</exec_depend>
  <exec_depend>mojin_utils</exec_depend>
  <exec_depend>moveit_commander</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-six</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-inotify-simple-pip</exec_depend>
  <exec_depend>robot_state_publisher</exec_depend>
  <exec_depend>rospy</exec_depend>
  <exec_depend>rqt_plot</exec_depend>
  <exec_depend>rviz</exec_depend>
  <exec_depend>shape_msgs</exec_depend>
  <exec_depend>std_msgs</exec_depend>
  <exec_depend>tf</exec_depend>
  <exec_depend>tf_conversions</exec_depend>
  <exec_depend>tf2_ros</exec_depend>
  <exec_depend>trajectory_msgs</exec_depend>
  <exec_depend>visualization_msgs</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-six</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-inotify-simple-pip</exec_depend>

which I find a bit weird

but I have no clear preference whether it should be:

  <exec_depend>actionlib</exec_depend>
  <exec_depend>angles</exec_depend>
  <exec_depend>cob_frame_tracker</exec_depend>
  <exec_depend>cob_twist_controller</exec_depend>
  <exec_depend>joint_state_publisher</exec_depend>
  <exec_depend>mojin_default_robot_config</exec_depend>
  <exec_depend>mojin_manipulation_interface</exec_depend>
  <exec_depend>mojin_moveit_config</exec_depend>
  <exec_depend>mojin_utils</exec_depend>
  <exec_depend>moveit_commander</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-six</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-inotify-simple-pip</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-six</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-inotify-simple-pip</exec_depend>
  <exec_depend>robot_state_publisher</exec_depend>
  <exec_depend>rospy</exec_depend>
  <exec_depend>rqt_plot</exec_depend>
  <exec_depend>rviz</exec_depend>
  <exec_depend>shape_msgs</exec_depend>
  <exec_depend>std_msgs</exec_depend>
  <exec_depend>tf</exec_depend>
  <exec_depend>tf_conversions</exec_depend>
  <exec_depend>tf2_ros</exec_depend>
  <exec_depend>trajectory_msgs</exec_depend>
  <exec_depend>visualization_msgs</exec_depend>

or

  <exec_depend>actionlib</exec_depend>
  <exec_depend>angles</exec_depend>
  <exec_depend>cob_frame_tracker</exec_depend>
  <exec_depend>cob_twist_controller</exec_depend>
  <exec_depend>joint_state_publisher</exec_depend>
  <exec_depend>mojin_default_robot_config</exec_depend>
  <exec_depend>mojin_manipulation_interface</exec_depend>
  <exec_depend>mojin_moveit_config</exec_depend>
  <exec_depend>mojin_utils</exec_depend>
  <exec_depend>moveit_commander</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-matplotlib</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-matplotlib</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-six</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-six</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-inotify-simple-pip</exec_depend>
  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-inotify-simple-pip</exec_depend>
  <exec_depend>robot_state_publisher</exec_depend>
  <exec_depend>rospy</exec_depend>
  <exec_depend>rqt_plot</exec_depend>
  <exec_depend>rviz</exec_depend>
  <exec_depend>shape_msgs</exec_depend>
  <exec_depend>std_msgs</exec_depend>
  <exec_depend>tf</exec_depend>
  <exec_depend>tf_conversions</exec_depend>
  <exec_depend>tf2_ros</exec_depend>
  <exec_depend>trajectory_msgs</exec_depend>
  <exec_depend>visualization_msgs</exec_depend>

@DLu
Copy link
Owner Author

DLu commented Dec 10, 2020

(opened #80)

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.

2 participants