Skip to content

Commit

Permalink
Blacklisting setuptools v50.0.0 (#71)
Browse files Browse the repository at this point in the history
* Blacklisting setuptools v50.0.0

* blacklisting setuptools==50.0.0 in non-sa ros1 ros2 docker env build scripts

Co-authored-by: Ojas Joshi <ojasjosh@amazon.com>
  • Loading branch information
ojasjoshi and Ojas Joshi authored Sep 1, 2020
1 parent 1e18d64 commit 8d745e2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ros1_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ros2_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion ros_bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8d745e2

Please sign in to comment.