Merge pull request #2124 from milliams/master

Change Travis to use pip3 for installing sphinx
PointCloudLibrary · Dec 6, 2017 · b0e83f2 · b0e83f2
2 parents 8161985 + 808164c
commit b0e83f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -325,7 +325,7 @@ function doc ()
   # Do not generate documentation for pull requests
   if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then exit; fi
   # Install sphinx
-  pip install --user sphinx pyparsing==2.1.9 sphinxcontrib-doxylink
+  pip3 install --user sphinx pyparsing==2.1.9 sphinxcontrib-doxylink
   # Configure
   mkdir $BUILD_DIR && cd $BUILD_DIR
   cmake -DDOXYGEN_USE_SHORT_NAMES=OFF \

diff --git a/.travis.yml b/.travis.yml
@@ -27,6 +27,7 @@ addons:
       - libvtk5-qt4-dev
       - libglew-dev
       - libopenni-dev
+      - python3-pip
 before_install:
   - bash .travis.sh before-install
 

diff --git a/doc/advanced/content/conf.py b/doc/advanced/content/conf.py
@@ -129,7 +129,7 @@
 html_show_copyright = False
 html_show_sphinx = False
 html_add_permalinks = None
-needs_sphinx = 1.0
+needs_sphinx = '1.0'
 file_insertion_enabled = True
 raw_enabled = True
 # Set up doxylink