Skip to content

Commit 11f8df9

Browse files
committed
do not create a python package
... where there is no package. Only a script was installed from the setup.py but catkin provides a separate command for that http://docs.ros.org/en/jade/api/catkin/html/howto/format2/installing_python.html I retained the installation to the global path. It is unusual to do that, but it has been like that for a long time. This started failing with recent setuptools with the following error message: --- error: Multiple top-level packages discovered in a flat-layout: ['debian', 'config', 'launch']. To avoid accidental inclusion of unwanted files or directories, setuptools will not proceed with this build. If you are trying to create a single distribution with multiple packages on purpose, you should not rely on automatic discovery. Instead, consider the following options: 1. set up custom discovery (`find` directive with `include` or `exclude`) 2. use a `src-layout` 3. explicitly set `py_modules` or `packages` with a list of names To find more information, look for "package discovery" on setuptools docs. ---
1 parent d3edd9b commit 11f8df9

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

fetch_calibration/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0.2)
22
project(fetch_calibration)
33

44
find_package(catkin)
5-
catkin_python_setup()
65
catkin_package()
76

87
install(DIRECTORY config
@@ -13,7 +12,12 @@ install(DIRECTORY launch
1312
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
1413
)
1514

16-
install(
15+
catkin_install_python(
1716
PROGRAMS scripts/camera_reconfigure.py
1817
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
1918
)
19+
20+
catkin_install_python(
21+
PROGRAMS scripts/calibrate_robot
22+
DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
23+
)

fetch_calibration/package.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
<url type="repository">https://github.com/fetchrobotics/fetch_ros</url>
2121

2222
<buildtool_depend>catkin</buildtool_depend>
23-
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
24-
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
2523

2624
<exec_depend version_gte="0.5.1">robot_calibration</exec_depend>
2725
</package>

fetch_calibration/setup.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)