Skip to content

Commit

Permalink
Bump CMake version to avoid CMP0048 warning (#89)
Browse files Browse the repository at this point in the history
* Bump CMake version to avoid CMP0048 warning

Signed-off-by: Shane Loretz <[email protected]>

* travisci: remove deprecated option for pip

* travisci: modernize things

* change how coverage is invoked with rostest

Co-authored-by: William Woodall <[email protected]>
  • Loading branch information
sloretz and wjwwood authored Mar 10, 2020
1 parent 5dae913 commit d4cc2a0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
dist: bionic
language: python
python:
- "2.7"
# command to install dependencies
install:
- pip install nose coverage pep8 PyYAML catkin_pkg rospkg empy python-coveralls --use-mirrors
- sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
- pip install nose coverage pep8 PyYAML catkin_pkg rospkg empy python-coveralls
- sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu bionic main" > /etc/apt/sources.list.d/ros-latest.list'
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
- sudo apt-get update
- sudo apt-get install python-rosdep
- sudo `which rosdep` init
- rosdep update
- rosdep install --from-paths ./ --rosdistro hydro -y
# Install image_proc to get a nodelet instaleld as a workaround to https://github.com/ros/pluginlib/pull/22
- sudo apt-get install ros-hydro-image-proc
- rosdep install --from-paths ./ --rosdistro melodic -y
# command to run tests
script:
- source /opt/ros/hydro/setup.bash
- source /opt/ros/melodic/setup.bash
- make coverage
- catkin_test_results /tmp/capabilities_build/build/test_results
notifications:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(capabilities)

find_package(catkin REQUIRED COMPONENTS message_generation std_msgs std_srvs)
Expand Down
4 changes: 2 additions & 2 deletions test/run_coverage
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import sys

try:
from coverage import main
from coverage.cmdline import main
except ImportError as exc:
print("Error: failed to run coverage: {0}".format(exc))
sys.exit("Error: failed to run coverage: {0}".format(exc))

if __name__ == '__main__':
sys.exit(main())

0 comments on commit d4cc2a0

Please sign in to comment.