Travis: disable droneapi and upgrade pip

This commit is contained in:
Andrew Tridgell 2015-03-12 17:27:17 +11:00
parent 67e10ff392
commit 2e6d79f449

View File

@ -10,7 +10,7 @@ OPT="$HOME/opt"
BASE_PKGS="gawk make git arduino-core curl"
SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache python-empy"
AVR_PKGS="gcc-avr binutils-avr avr-libc"
PYTHON_PKGS="pymavlink MAVProxy droneapi catkin_pkg"
PYTHON_PKGS="pymavlink MAVProxy catkin_pkg"
PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \
autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \
zip genromfs"
@ -29,6 +29,9 @@ APT_GET="sudo apt-get -qq --assume-yes"
$APT_GET update
$APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $AVR_PKGS
pip install --upgrade pip || {
echo "pip upgrade failed"
}
pip install --upgrade setuptools || {
echo "setuptools upgrade failed"
}