Skip to content

Noetic/Python3 compatibility #5

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

Merged
merged 2 commits into from
Aug 12, 2020
Merged

Noetic/Python3 compatibility #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
825b0a8
CMakeLists: Use catkin_install_python for script installation
sfalexrog Mar 18, 2020
a2a1906
package.xml: Use conditional dependencies
sfalexrog Mar 18, 2020
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ include_directories(

## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
install(PROGRAMS
catkin_install_python(PROGRAMS
scripts/ros_pytest_runner
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
Expand Down
5 changes: 3 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<package format="2">
<package format="3">
<name>ros_pytest</name>
<version>0.1.2</version>
<description>The ros_pytest package</description>
Expand Down Expand Up @@ -50,7 +50,8 @@
<!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<depend>rospy</depend>
<depend>python-pytest</depend>
<depend condition="$ROS_PYTHON_VERSION == 2">python-pytest</depend>
<depend condition="$ROS_PYTHON_VERSION == 3">python3-pytest</depend>
<test_depend>rostest</test_depend>


Expand Down