MIL COMMON: clean redundant packages and prepare for great merge & sonar OS #216
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kev-the-dev
force-pushed
the
great-integration
branch
from
e0acbff to
4cca380
Compare
kev-the-dev
changed the title
DSsoto
requested changes
Apr 11, 2017
| #from sub8_alarm import AlarmListener, AlarmBroadcaster | ||
| from ros_alarms import AlarmBroadcaster, AlarmListener | ||
| import sub8_ros_tools as sub8_utils | ||
| import mil_ros_tools as sub8_utils |
There was a problem hiding this comment.
This should not be imported as sub8_utils.
| @@ -2,7 +2,7 @@ | |||
| import sys | |||
| import rospy | |||
| import nav_msgs.msg as nav_msgs | |||
| import sub8_ros_tools as sub8_utils | |||
| import mil_ros_tools as sub8_utils | |||
There was a problem hiding this comment.
This should not be imported as sub8_utils.
| @@ -12,7 +12,7 @@ | |||
| from scipy import linalg | |||
|
|
|||
| import actionlib | |||
| import uf_common.msg as uf_common_msgs | |||
| import mil_msgs.msg as mil_msgs_msgs | |||
There was a problem hiding this comment.
It soesnt make sense to import as a name and that name is longer. How about:
from mil_msgs.msg import MoveToAction, MoveToGoal
| @@ -10,7 +10,7 @@ import yaml | |||
| import roslib | |||
| import rosbag | |||
| from tf import transformations | |||
| import sub8_ros_tools as sub8_utils | |||
| import mil_ros_tools as sub8_utils | |||
| @@ -1,6 +1,6 @@ | |||
| import numpy as np | |||
| import rospy | |||
| import sub8_ros_tools as sub8_utils | |||
| import mil_ros_tools as sub8_utils | |||
Ran the following commands: git grep -l 'sub8_ros_tools' | xargs sed -i 's/sub8_ros_tools/mil_ros_tools/g' git grep -l 'uf_common' | xargs sed -i 's/uf_common/mil_msgs/g' git grep -l 'sub8_misc_tools' | xargs sed -i 's/sub8_misc_tools/mil_misc_tools/g' git grep -l 'sub8_vision_lib' | xargs sed -i 's/sub8_vision_lib/mil_vision_lib/g' I'll see what it breaks in following commits
Remove sub8_ros_tools because it is a duplicate of mil_tools Remove uf_common beacuase it is a duplicate of mil_msgs
…common passive sonar
kev-the-dev
force-pushed
the
great-integration
branch
from
2a1ab41 to
51680bc
Compare
kev-the-dev
force-pushed
the
great-integration
branch
from
ef71a83 to
20a16a6
Compare
|
This built on the CI and passed all unit tests except the ros_alarms test that always fails. |
DSsoto
changed the title
DSsoto
approved these changes
Apr 11, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I think Nothings broken
sub8_missions run_common listshows all missions without import errorsObviously don't merge until uf-mil/mil_common#15 is merged and uf-mil/mil_common#28