From e43e502cb75d5b429c2f4ae3b997d39522550472 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 11 Sep 2017 11:13:45 +0200 Subject: [PATCH 1/2] Fix installation of meson and pillow (pip3) in travis. I don't know why, but the travis build doesn't work since few days. It seems that pip3 cannot install in `/usr/local` anymore. Probably related to last travis change* as a lot of people seems to have problem with this update and python (even if this is not the same problems) Anyway, we should not install a dependencies in global environment without a sudo. Let's install the pip3 dependencies for the user only. [*] https://docs.travis-ci.com/user/build-environment-updates/2017-09-06/ --- travis/install_extra_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/install_extra_deps.sh b/travis/install_extra_deps.sh index a42c30b..fa5910c 100755 --- a/travis/install_extra_deps.sh +++ b/travis/install_extra_deps.sh @@ -6,8 +6,8 @@ orig_dir=$(pwd) sudo apt-get update -qq sudo apt-get install -qq python3-pip zlib1g-dev libjpeg-dev -pip3 install meson -pip3 install pillow +pip3 install --user meson +pip3 install --user pillow # ninja git clone git://github.com/ninja-build/ninja.git From e76ca14d63ebaaded78bb944a08b42f3c5fe7454 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 11 Sep 2017 13:24:29 +0200 Subject: [PATCH 2/2] Keep the symlinks. It seems that shutil.copytree on travis fails to copy symlinks to directory. It is probably due to last travis changes. Let's keep the symlinks as they are. --- dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.py b/dependencies.py index 478c176..dd164cd 100644 --- a/dependencies.py +++ b/dependencies.py @@ -377,7 +377,7 @@ class KiwixAndroid(Dependency): def _configure(self, context): if not os.path.exists(self.build_path): - shutil.copytree(self.source_path, self.build_path) + shutil.copytree(self.source_path, self.build_path, symlinks=True) try: shutil.rmtree(pj(self.build_path, 'kiwixlib', 'src', 'main')) except FileNotFoundError: