Ubuntu 16.04 has a rather old Cython version which breaks pyverbs'
build.
Upgrade it using pip.
Signed-off-by: Noa Osherovich <noaos@xxxxxxxxxxxx>
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
.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
--
2.17.2
