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

Hotfix to make Travis testing pass #1750

Merged
merged 4 commits into from
Jun 22, 2016
Merged

Hotfix to make Travis testing pass #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7325564
Make test for label_image_decomposer stable
wkentaro Jun 18, 2016
d652576
Make test for sklearn_classifier stable
wkentaro Jun 18, 2016
440a167
Use small sized image for stable testing
wkentaro Jun 20, 2016
81315ab
Install jsk_data from source because of the bug in testing tool
wkentaro Jun 21, 2016
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
2 changes: 1 addition & 1 deletion .travis.rosinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- git:
uri: https://github.com/jsk-ros-pkg/jsk_common.git
local-name: jsk-ros-pkg/jsk_common
version: master
version: 2.0.16
Copy link
Member

Choose a reason for hiding this comment

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

do we still need this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, because jsk-ros-pkg/jsk_common#1417 is not yet merged and released.

Copy link
Member

Choose a reason for hiding this comment

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

I thought jsk_tools 2.0.16 has enough python dependency

$ sudo aptitude show ros-indigo-jsk-tools
Package: ros-indigo-jsk-tools            
State: installed
Automatically installed: no
Version: 2.0.16-1trusty-20160619-095439-0700
Priority: extra
Section: misc
Maintainer: Ryohei Ueda <[email protected]>
Architecture: amd64
Uncompressed Size: 388 k
Depends: python-colorama, python-texttable, ros-indigo-axis-camera,
         ros-indigo-jsk-network-tools, ros-indigo-jsk-topic-tools,
         ros-indigo-pr2-computer-monitor, ros-indigo-rosbag,
         ros-indigo-rosemacs, ros-indigo-rosgraph-msgs, ros-indigo-rospy,
         ros-indigo-rqt-reconfigure
Conflicts: ros-indigo-jsk-tools

Copy link
Member Author

Choose a reason for hiding this comment

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

It needs python-termcolor.

Copy link
Member

Choose a reason for hiding this comment

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

python-termcolor is not released on saucy and will not included deb
dependency, but if you wait 1 more week, we can release new version
including python-termcolor due to terminating saucy support for indigo (
http://lists.ros.org/pipermail/ros-release/2016-June/004879.html)
$ rosdep resolve --os=ubuntu:saucy python-termcolor
#pip
termcolor

◉ Kei Okada

On Wed, Jun 22, 2016 at 4:31 PM, Kentaro Wada [email protected]
wrote:

In .travis.rosinstall
#1750 (comment)
:

@@ -1,7 +1,7 @@

It needs python-termcolor.

—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
https://github.com/jsk-ros-pkg/jsk_recognition/pull/1750/files/81315abc27562253ac8d9191f7c2f17d2545408e#r68006114,
or mute the thread
https://github.com/notifications/unsubscribe/AAeG3LjFWCU6tI69qEuzo-VuvzUVFMr_ks5qOOS8gaJpZM4I3fwk
.

Copy link
Member Author

Choose a reason for hiding this comment

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

I know that. Do you mean you cannot merge this until that?

Copy link
Member

Choose a reason for hiding this comment

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

merged but please do not forget to write another PR a week later...

Copy link
Member Author

Choose a reason for hiding this comment

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

I opened an issue.

# - git:
# uri: https://github.com/jsk-ros-pkg/jsk_roseus.git
# local-name: jsk-ros-pkg/jsk_roseus
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ env:
- USE_JENKINS=true
matrix:
- ROS_DISTRO=hydro USE_DEB=false CATKIN_TOOLS_BUILD_OPTIONS="-iv --summarize --no-status --no-color"
- ROS_DISTRO=indigo USE_DEB=true NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_released_testing.bash' ROS_REPOSITORY_PATH="http://packages.ros.org/ros/ubuntu" NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_pcl1.8.bash' NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=false NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_released_testing.bash' ROS_REPOSITORY_PATH="http://packages.ros.org/ros/ubuntu" NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
- ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_pcl1.8.bash' NUMBER_OF_LOGS=12
- ROS_DISTRO=jade USE_DEB=false
matrix:
allow_failures:
- env: ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
- env: ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
script:
- source .travis/travis.sh
- (cd doc && source setup.sh && make html)
Binary file added jsk_perception/sample/image/laugh_out_loud_joke_book.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added jsk_perception/sample/image/laugh_out_loud_joke_book_mask.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added jsk_perception/sample/image/lena.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed jsk_perception/sample/laugh_out_loud_joke_book.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed jsk_perception/sample/laugh_out_loud_joke_book_mask.jpg
View file
Open in desktop
Binary file not shown.
18 changes: 9 additions & 9 deletions jsk_perception/sample/sample_add_mask_image.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
<node name="image_publisher"
pkg="jsk_perception" type="image_publisher.py">
<rosparam subst_value="true">
file_name: $(find jsk_perception)/sample/laugh_out_loud_joke_book.jpg
file_name: $(find jsk_perception)/sample/image/laugh_out_loud_joke_book.jpg
</rosparam>
</node>

<node name="mask_image_generator0"
pkg="jsk_perception" type="mask_image_generator">
<remap from="~input" to="image_publisher/output" />
<rosparam>
offset_x: 100
offset_y: 100
width: 256
height: 256
offset_x: 50
offset_y: 50
width: 128
height: 128
</rosparam>
</node>

<node name="mask_image_generator1"
pkg="jsk_perception" type="mask_image_generator">
<remap from="~input" to="image_publisher/output" />
<rosparam>
offset_x: 200
offset_y: 200
width: 256
height: 256
offset_x: 100
offset_y: 100
width: 128
height: 128
</rosparam>
</node>

Expand Down
4 changes: 2 additions & 2 deletions jsk_perception/sample/sample_bof_object_recognition.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

<node name="raw_image"
pkg="jsk_perception" type="image_publisher.py">
<param name="~file_name" value="$(find jsk_perception)/sample/laugh_out_loud_joke_book.jpg" />
<param name="~file_name" value="$(find jsk_perception)/sample/image/laugh_out_loud_joke_book.jpg" />
</node>

<node name="mask_image"
pkg="jsk_perception" type="image_publisher.py">
<param name="~file_name" value="$(find jsk_perception)/sample/laugh_out_loud_joke_book_mask.jpg" />
<param name="~file_name" value="$(find jsk_perception)/sample/image/laugh_out_loud_joke_book_mask.jpg" />
</node>

<node name="label_image"
Expand Down
27 changes: 20 additions & 7 deletions jsk_perception/sample/sample_label_image_decomposer.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,30 @@

<arg name="gui" default="true" />

<include file="$(find jsk_perception)/sample/sample_image_publisher.launch">
<arg name="gui" value="false" />
</include>
<node name="image_publisher"
pkg="jsk_perception" type="image_publisher.py">
<rosparam subst_value="true">
file_name: $(find jsk_perception)/sample/image/lena.jpg
encoding: bgr8
publish_info: false
</rosparam>
</node>

<!-- create label -->
<node name="grid_label"
pkg="jsk_perception" type="grid_label">
<remap from="~input" to="image_publisher/output" />
<rosparam>
label_size: 128
</rosparam>
</node>

<node name="label_image_decomposer"
pkg="jsk_perception" type="label_image_decomposer.py">
<remap from="~input" to="raw_image_bgr/image_color" />
<remap from="~input/label" to="label_image/label" />
<remap from="~input" to="image_publisher/output" />
<remap from="~input/label" to="grid_label/output" />
<rosparam>
approximate_sync: true
queue_size: 100
queue_size: 30
</rosparam>
</node>

Expand Down
10 changes: 5 additions & 5 deletions jsk_perception/sample/sample_mask_image_generator.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<node name="image_publisher"
pkg="jsk_perception" type="image_publisher.py">
<rosparam subst_value="true">
file_name: $(find jsk_perception)/sample/laugh_out_loud_joke_book.jpg
file_name: $(find jsk_perception)/sample/image/laugh_out_loud_joke_book.jpg
</rosparam>
</node>

<node name="mask_image_generator"
pkg="jsk_perception" type="mask_image_generator">
<remap from="~input" to="image_publisher/output" />
<rosparam>
offset_x: 100
offset_y: 200
width: 256
height: 256
offset_x: 50
offset_y: 100
width: 128
height: 128
</rosparam>
</node>

Expand Down
4 changes: 2 additions & 2 deletions jsk_perception/test/sklearn_classifier.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<test test-name="test_sklearn_classifier"
name="test_sklearn_classifier"
pkg="jsk_tools" type="test_topic_published.py"
retry="3">
retry="3" time-limit="120">
<rosparam>
topic_0: /sklearn_classifier/output
timeout_0: 30
timeout_0: 110
</rosparam>
</test>

Expand Down