From patchwork Sun Feb 24 13:06:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noa Osherovich X-Patchwork-Id: 10827959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B70A813B5 for ; Sun, 24 Feb 2019 13:09:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A30EF29DAD for ; Sun, 24 Feb 2019 13:09:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 944DD2AA16; Sun, 24 Feb 2019 13:09:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FCB529DAD for ; Sun, 24 Feb 2019 13:09:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728259AbfBXNI7 (ORCPT ); Sun, 24 Feb 2019 08:08:59 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:50594 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728313AbfBXNI5 (ORCPT ); Sun, 24 Feb 2019 08:08:57 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from noaos@mellanox.com) with ESMTPS (AES256-SHA encrypted); 24 Feb 2019 15:06:49 +0200 Received: from reg-l-vrt-059-009.mtl.labs.mlnx (reg-l-vrt-059-009.mtl.labs.mlnx [10.135.59.9]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x1OD6mfm026210; Sun, 24 Feb 2019 15:06:49 +0200 From: Noa Osherovich To: leonro@mellanox.com, jgg@mellanox.com, dledford@redhat.com Cc: linux-rdma@vger.kernel.org, Noa Osherovich Subject: [PATCH rdma-core 18/19] travis: Update Cython version Date: Sun, 24 Feb 2019 15:06:37 +0200 Message-Id: <20190224130638.31848-19-noaos@mellanox.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190224130638.31848-1-noaos@mellanox.com> References: <20190224130638.31848-1-noaos@mellanox.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ubuntu 16.04 has a rather old Cython version which breaks pyverbs' build. Upgrade it using pip. Signed-off-by: Noa Osherovich Signed-off-by: Jason Gunthorpe --- .travis.yml | 3 ++- buildlib/cbuild | 4 ++++ buildlib/travis-build | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1c1c0ea2bb8..660b306797bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ addons: # pyverbs - python3-dev - - cython3 + - python3-pip service: - docker @@ -47,6 +47,7 @@ before_script: - wget -q http://releases.linaro.org/$LATEST_GCC_LINARO_URL - mkdir $HOME/aarch64 && tar xf $LATEST_GCC_LINARO_TAR -C $HOME/aarch64 --strip 1 - rm $LATEST_GCC_LINARO_TAR + - http_proxy= pip3 install cython script: - buildlib/travis-build - buildlib/travis-checkpatch diff --git a/buildlib/cbuild b/buildlib/cbuild index 9ced0de6be07..a4f992db2888 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -297,6 +297,9 @@ class travis(APTEnvironment): (cd /usr/local/bin/ && ln -sf ../clang*/bin/clang-7 .)""".format(llvm_tar)]; return cmds; + def get_cython(self): + return ["""RUN pip3 install cython"""] + def get_docker_file(self): # First this to get apt-add-repository self.pkgs = {"software-properties-common"} @@ -315,6 +318,7 @@ class travis(APTEnvironment): res.lines.extend(self.get_before_script()) res.lines.extend(self.get_clang()) + res.lines.extend(self.get_cython()) return res; diff --git a/buildlib/travis-build b/buildlib/travis-build index b44f13e91145..f84b77fc7821 100755 --- a/buildlib/travis-build +++ b/buildlib/travis-build @@ -1,5 +1,7 @@ #!/bin/bash +PATH=/home/`whoami`/.local/bin:$PATH + # Stop on error set -e # Echo all commands to Travis log