Skip to content

locking more-itertools to 5.0.0 as it is the last python2-compatible one #272

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.

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

Draft
wants to merge 3 commits into
base: devel
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -37,8 +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} apt-get install sudo -y
- 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
Expand Down
2 changes: 2 additions & 0 deletions cmake/catkin-pip-fixups.req
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion travis_checks.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down