From ebb0b4c2650bcb675d54221e9304be41cb8409c4 Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Tue, 29 Dec 2020 21:32:36 +0100 Subject: [PATCH] Azure: fix python3 usage --- .azure/autotest_template.yml | 4 ++-- .azure/azure-pipelines.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure/autotest_template.yml b/.azure/autotest_template.yml index e83f9bc7e6..37d7742040 100644 --- a/.azure/autotest_template.yml +++ b/.azure/autotest_template.yml @@ -16,9 +16,9 @@ jobs: displayName: Initialize MAVLink submodule - script: git submodule update --recursive --init modules/uavcan displayName: 'Initialize UAVCAN submodule' - - script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%')/modules/mavlink/pymavlink && python setup.py build install --user" + - script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%')/modules/mavlink/pymavlink && python3 setup.py build install --user" displayName: 'Install pymavlink from submodule' - - script: C:\Cygwin\bin\bash --login -c "pip install MAVProxy" + - script: C:\Cygwin\bin\bash --login -c "pip3 install MAVProxy" displayName: 'Install MAVProxy in Cygwin' - script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%') && Tools/autotest/autotest.py ${{ format('build.{0} {1}.{2}', parameters.build_target, parameters.action, parameters.action_target) }}" displayName: ${{ format('Run {0} autotest', parameters.name) }} diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index ae68d010fc..a5de3018bd 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -8,7 +8,7 @@ jobs: - script: choco install cygwin --params "/InstallDir:C:\Cygwin /NoStartMenu /NoAdmin" displayName: 'Install Cygwin' - - script: choco install cygwin32-gcc-g++ python36 python36-future python36-lxml python36-pip python-setuptools git libexpat procps gettext --source cygwin + - script: choco install cygwin32-gcc-g++ python36 python36-future python36-lxml python36-pip python36-setuptools python36-wheel git libexpat procps gettext --source cygwin displayName: 'Install Cygwin packages' - script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%') && git submodule update --recursive --init --depth 2" displayName: Initialize submodules