Merge pull request #189 from xentec/patch-1

Fixing doc building with newer pip versions
This commit is contained in:
Victor Zverovich 2015-07-26 13:55:35 -07:00
commit 69a0317590

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
# Build the documentation. # Build the documentation.
from __future__ import print_function from __future__ import print_function
@ -17,7 +17,7 @@ def pip_install(package, commit=None):
# Old versions of pip such as the one installed on Travis don't support # Old versions of pip such as the one installed on Travis don't support
# the show command - continue installation in this case. # the show command - continue installation in this case.
# Otherwise throw CalledProcessError. # 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) raise CalledProcessError(p.returncode, cmd)
package = 'git+git://github.com/{0}.git@{1}'.format(package, commit) package = 'git+git://github.com/{0}.git@{1}'.format(package, commit)
check_call(['pip', 'install', '-q', package]) check_call(['pip', 'install', '-q', package])