Skip to content

Commit 8f1972f

Browse files
authored
Merge pull request #74 from tue-robotics/openpose_python_and_linting
Openpose python and linting
2 parents 808fa20 + 4c45d9b commit 8f1972f

File tree

39 files changed

+515
-611
lines changed

39 files changed

+515
-611
lines changed

image_recognition/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package format="2">
33
<name>image_recognition</name>
44
<version>0.0.4</version>
5-
<description>The image_recognition package</description>
5+
<description>The image_recognition packages for extracting recognitions from images.</description>
66

77
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
88

image_recognition_analysis/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ catkin_python_setup()
77

88
catkin_package()
99

10+
# Test catkin lint
11+
find_program(CATKIN_LINT catkin_lint REQUIRED)
12+
execute_process(COMMAND "${CATKIN_LINT}" "-q" "-W2" "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE lint_result)
13+
if(NOT ${lint_result} EQUAL 0)
14+
message(FATAL_ERROR "catkin_lint failed")
15+
endif()
16+
1017
install(PROGRAMS
1118
scripts/classifier_metrics
1219
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

image_recognition_analysis/package.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44
<version>0.0.1</version>
55
<description>The image_recognition_analysis package</description>
66

7-
<maintainer email="[email protected]">Loy van Beek</maintainer>
7+
<author email="[email protected]">Loy van Beek</author>
8+
<maintainer email="[email protected]">Rein Appeldoorn</maintainer>
89

910
<license>MIT</license>
1011

1112
<url type="website">https://github.com/tue-robotics/image_recognition/tree/master/image_recognition_analysis</url>
1213

1314
<buildtool_depend>catkin</buildtool_depend>
1415

16+
<build_depend>python-catkin-lint</build_depend>
17+
1518
<exec_depend>image_recognition_util</exec_depend>
1619
<exec_depend>python-matplotlib</exec_depend>
1720
<exec_depend>python-numpy</exec_depend>

image_recognition_jetson/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ add_dependencies(detect_net ${catkin_EXPORTED_TARGETS})
4242
add_executable(detect_net_ros src/detect_net_ros.cpp)
4343
target_link_libraries(detect_net_ros detect_net)
4444

45+
# Test catkin lint
46+
find_program(CATKIN_LINT catkin_lint REQUIRED)
47+
execute_process(COMMAND "${CATKIN_LINT}" "-q" "-W2" "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE lint_result)
48+
if(NOT ${lint_result} EQUAL 0)
49+
message(FATAL_ERROR "catkin_lint failed")
50+
endif()
51+
4552
install(TARGETS
4653
detect_net_ros
4754
detect_net

image_recognition_jetson/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

13+
<build_depend>python-catkin-lint</build_depend>
14+
1315
<depend>cv_bridge</depend>
1416
<depend>image_recognition_msgs</depend>
1517
<depend>image_recognition_util</depend>

image_recognition_keras/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ catkin_python_setup()
77

88
catkin_package()
99

10+
# Test catkin lint
11+
find_program(CATKIN_LINT catkin_lint REQUIRED)
12+
execute_process(COMMAND "${CATKIN_LINT}" "-q" "-W2" "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE lint_result)
13+
if(NOT ${lint_result} EQUAL 0)
14+
message(FATAL_ERROR "catkin_lint failed")
15+
endif()
16+
1017
install(PROGRAMS
1118
scripts/face_properties_node
1219
scripts/get_face_properties

image_recognition_keras/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

13+
<build_depend>python-catkin-lint</build_depend>
14+
1315
<exec_depend>diagnostic_updater</exec_depend>
1416
<exec_depend>image_recognition_msgs</exec_depend>
1517
<exec_depend>image_recognition_util</exec_depend>

image_recognition_msgs/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,10 @@ generate_messages(
3434
catkin_package(
3535
CATKIN_DEPENDS message_runtime sensor_msgs
3636
)
37+
38+
# Test catkin lint
39+
find_program(CATKIN_LINT catkin_lint REQUIRED)
40+
execute_process(COMMAND "${CATKIN_LINT}" "-q" "-W2" "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE lint_result)
41+
if(NOT ${lint_result} EQUAL 0)
42+
message(FATAL_ERROR "catkin_lint failed")
43+
endif()

image_recognition_msgs/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
<buildtool_depend>catkin</buildtool_depend>
1212

13+
<build_depend>python-catkin-lint</build_depend>
14+
1315
<build_depend>message_generation</build_depend>
1416
<depend>sensor_msgs</depend>
1517
<exec_depend>message_runtime</exec_depend>

image_recognition_openface/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,11 @@ install(PROGRAMS
1212
scripts/get_face_recognition
1313
scripts/train_from_images
1414
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
15-
)
15+
)
16+
17+
# Test catkin lint
18+
find_program(CATKIN_LINT catkin_lint REQUIRED)
19+
execute_process(COMMAND "${CATKIN_LINT}" "-q" "-W2" "${CMAKE_SOURCE_DIR}" RESULT_VARIABLE lint_result)
20+
if(NOT ${lint_result} EQUAL 0)
21+
message(FATAL_ERROR "catkin_lint failed")
22+
endif()

0 commit comments

Comments
 (0)