From 0586a9e4ea5e39499e2c049f1189a1bae0239054 Mon Sep 17 00:00:00 2001 From: xentec Date: Sun, 26 Jul 2015 17:48:26 +0200 Subject: [PATCH 1/2] Specify python version in doc build script Some distros changed their default to python3 causing it to fail. --- doc/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build.py b/doc/build.py index 58c9c423..78ada3df 100755 --- a/doc/build.py +++ b/doc/build.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Build the documentation. from __future__ import print_function From 583f7e9e1cf798616a78a503eebfd017af5f26ea Mon Sep 17 00:00:00 2001 From: xentec Date: Sun, 26 Jul 2015 17:50:18 +0200 Subject: [PATCH 2/2] Fix build docs on with newer pip versions A patch for 3b224e18136013f3765b8df407cc537f32c93885 --- doc/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build.py b/doc/build.py index 78ada3df..340ce504 100755 --- a/doc/build.py +++ b/doc/build.py @@ -17,7 +17,7 @@ def pip_install(package, commit=None): # Old versions of pip such as the one installed on Travis don't support # the show command - continue installation in this case. # Otherwise throw CalledProcessError. - if 'No command by the name pip show' not in stderr: + if p.returncode > 1 and 'No command by the name pip show' not in stderr: raise CalledProcessError(p.returncode, cmd) package = 'git+git://github.com/{0}.git@{1}'.format(package, commit) check_call(['pip', 'install', '-q', package])