From 1e0f1830f71cc62ec0986f555a2b253562771756 Mon Sep 17 00:00:00 2001 From: Ojas Joshi Date: Mon, 31 Aug 2020 16:14:48 -0700 Subject: [PATCH 1/2] Blacklisting setuptools v50.0.0 --- ros_bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ros_bootstrap.sh b/ros_bootstrap.sh index 51f700c..b671b54 100755 --- a/ros_bootstrap.sh +++ b/ros_bootstrap.sh @@ -3,7 +3,7 @@ set -xe # Set up ROS APT and install basic dependencies (rosdep, rosinstall). Must have ROS_VERSION set when called. sudo apt-get update && sudo apt-get install -q -y dirmngr curl gnupg2 lsb-release zip python3-pip python3-apt dpkg -sudo -H pip3 install -U setuptools +sudo -H pip3 install -U setuptools!=50.0.0 if [ "${ROS_VERSION}" == "1" ]; then echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/ros-latest.list From d2f56511dab42fa4d273f8c4c7a50e5a689e796b Mon Sep 17 00:00:00 2001 From: Ojas Joshi Date: Mon, 31 Aug 2020 17:47:57 -0700 Subject: [PATCH 2/2] blacklisting setuptools==50.0.0 in non-sa ros1 ros2 docker env build scripts --- ros1_build.sh | 2 +- ros2_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ros1_build.sh b/ros1_build.sh index ad74c3e..1bb5786 100755 --- a/ros1_build.sh +++ b/ros1_build.sh @@ -3,7 +3,7 @@ set -xe # install dependencies sudo apt-get update && sudo apt-get install -y lcov python3-pip python-rosinstall libgtest-dev cmake && rosdep update -sudo apt-get update && sudo apt-get install -y python3-colcon-common-extensions && sudo -H pip3 install -U setuptools +sudo apt-get update && sudo apt-get install -y python3-colcon-common-extensions && sudo -H pip3 install -U setuptools!=50.0.0 # nosetests needs coverage for Python 2 sudo apt-get install python-pip -y && sudo -H pip install -U coverage # enable Python coverage "https://github.com/ros/catkin/blob/kinetic-devel/cmake/test/nosetests.cmake#L59" diff --git a/ros2_build.sh b/ros2_build.sh index 4a86671..9102067 100755 --- a/ros2_build.sh +++ b/ros2_build.sh @@ -3,7 +3,7 @@ set -xe # install dependencies sudo apt-get update && sudo apt-get install -y python3 python3-pip lcov cmake && rosdep update -sudo apt-get update && sudo apt-get install -y python3-rosinstall python3-colcon-common-extensions && sudo -H pip3 install -U setuptools coverage pytest +sudo apt-get update && sudo apt-get install -y python3-rosinstall python3-colcon-common-extensions && sudo -H pip3 install -U setuptools!=50.0.0 coverage pytest apt list --upgradable 2>/dev/null | awk {'print $1'} | sed 's/\/.*//g' | grep ${ROS_DISTRO} | xargs sudo apt-get install -y REPO_NAME=$(basename -- ${TRAVIS_BUILD_DIR})