From 716f393cb9057147c080e2401d12105ad4cfc94e Mon Sep 17 00:00:00 2001 From: AlexV Date: Wed, 30 Sep 2020 12:29:15 +0200 Subject: [PATCH 1/3] locking more-itertools to 5.0.0 as it is the last python2-compatible one --- cmake/catkin-pip-fixups.req | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/catkin-pip-fixups.req b/cmake/catkin-pip-fixups.req index 45c4e6b..a2a6fb5 100644 --- a/cmake/catkin-pip-fixups.req +++ b/cmake/catkin-pip-fixups.req @@ -5,6 +5,8 @@ # Upgrading to use latest nose nose==1.3.7 +# blocking dependencies to python2 compatible versions +more-itertools==5.0.0 # Also install pytest since we support it pytest==3.5.0 pytest-cov==2.4.0 From 76b961d7e734a2d66a72e868646e3526ddcd4e7e Mon Sep 17 00:00:00 2001 From: AlexV Date: Wed, 30 Sep 2020 13:51:50 +0200 Subject: [PATCH 2/3] removing indigo, jade and lunar travis test. adding melodic. --- .travis.yml | 11 ++++------- travis_checks.bash | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e953389..2d0d0a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,10 @@ env: # This will check any ROS distro supported on this OS # checking devel and install separately so that they don't influence each other (dependencies, path, env, etc.) matrix: - - ROS_DISTRO=indigo ROS_FLOW=devel - - ROS_DISTRO=indigo ROS_FLOW=install - - ROS_DISTRO=jade ROS_FLOW=devel - - ROS_DISTRO=jade ROS_FLOW=install - ROS_DISTRO=kinetic ROS_FLOW=devel - ROS_DISTRO=kinetic ROS_FLOW=install - - ROS_DISTRO=lunar ROS_FLOW=devel - - ROS_DISTRO=lunar ROS_FLOW=install + - ROS_DISTRO=melodic ROS_FLOW=devel + - ROS_DISTRO=melodic ROS_FLOW=install # TODO : test all possible flows (installing deps on devel or not, etc.) before_install: @@ -38,7 +34,8 @@ install: # refreshing packages - docker exec -ti ${CONTAINER_NAME} apt-get update # TMP Patch because rosdep doesnt declare a dependency to sudo yet (2016-08-25) and it doesnt come with xenial - - docker exec -ti ${CONTAINER_NAME} apt-get install sudo -y + #- docker exec -ti ${CONTAINER_NAME} apt-get install sudo -y + - docker exec -ti ${CONTAINER_NAME} sudo rosdep init - docker exec -ti ${CONTAINER_NAME} rosdep update # copying local clone to the running container (volume is currently broken) - docker cp . ${CONTAINER_NAME}:/git_clone diff --git a/travis_checks.bash b/travis_checks.bash index 02379af..0b81c43 100755 --- a/travis_checks.bash +++ b/travis_checks.bash @@ -9,7 +9,7 @@ cd $DIR # It is used by travis and can also be used by a developer for checking his current working tree. # # These variables need to be setup before calling this script: -# CI_ROS_DISTRO [indigo | jade | kinetic] +# CI_ROS_DISTRO [kinetic | melodic] # ROS_FLOW [devel | install] # For travis docker, this is already done by the entrypoint in docker image. From ed570328bee11e02acc08cc64b7ba0a3e435e0d2 Mon Sep 17 00:00:00 2001 From: AlexV Date: Wed, 30 Sep 2020 14:01:05 +0200 Subject: [PATCH 3/3] now installing rosdep manually... --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d0d0a8..e3eb60c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,10 @@ before_install: install: # refreshing packages - docker exec -ti ${CONTAINER_NAME} apt-get update + - docker exec -ti ${CONTAINER_NAME} apt-get install python-rosdep # TMP Patch because rosdep doesnt declare a dependency to sudo yet (2016-08-25) and it doesnt come with xenial #- docker exec -ti ${CONTAINER_NAME} apt-get install sudo -y - - docker exec -ti ${CONTAINER_NAME} sudo rosdep init + - docker exec -ti ${CONTAINER_NAME} rosdep init - docker exec -ti ${CONTAINER_NAME} rosdep update # copying local clone to the running container (volume is currently broken) - docker cp . ${CONTAINER_NAME}:/git_clone