Documentation build fixes (#3527)

Author: philippjfr

.travis.yml

@@ -153,17 +153,18 @@ jobs:
         - nbsite build --what=html --output=builtdocs
       after_success:
         - pip install awscli
-        - aws s3 sync ./ s3://holoviews-doc-builds/$TRAVIS_BUILD_NUMBER --exclude ".git/*"
+        - aws s3 sync ./ s3://holoviews-doc-builds/$TRAVIS_BUILD_NUMBER --exclude=".git/*" --exclude="doc/nbpublisher/*"
 
     - &gallery_build
       <<: *doc_build
       stage: gallery_dev
-      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_DOC_HTML='true' HV_DOC_GALLERY='true' HV_REQUIREMENTS="doc" BUCKET="dev."
+      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_DOC_HTML='true' HV_REQUIREMENTS="doc" BUCKET="dev."
       script:
         - bokeh sampledata
         - pip install awscli
         - conda install -c conda-forge mpl_sample_data --no-deps
         - aws s3 sync s3://holoviews-doc-builds/$TRAVIS_BUILD_NUMBER ./
+        - git reset --hard --recurse-submodule
         - nbsite build --what=html --output=builtdocs
       after_success:
         - aws s3 sync ./builtdocs s3://${BUCKET}holoviews.org/
@@ -181,7 +182,9 @@ jobs:
 
     - <<: *gallery_build
       stage: gallery
-      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_DOC_HTML='true' HV_DOC_GALLERY='true' HV_REQUIREMENTS="doc" BUCKET=""
+      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_DOC_HTML='true' HV_REQUIREMENTS="doc"
+      after_success:
+        - aws s3 sync ./builtdocs s3://holoviews.org/
 
     ########## END-USER PACKAGES ##########
 
@@ -211,7 +214,7 @@ jobs:
       stage: pip_dev_package
       env: PYPI="https://test.pypi.org/legacy/" TRAVIS_NOCACHE=$TRAVIS_JOB_ID
       install:
-        - doit develop_install $CHANS_DEV -o unit_tests && pip uninstall -y holoviews
+        - doit travis_wait 20 develop_install $CHANS_DEV -o unit_tests && pip uninstall -y holoviews
         - doit pip_on_conda
         - doit ecosystem=pip package_build
       script: doit ecosystem=pip package_upload -u $TPPU -p $TPPP -r ${PYPI}
@@ -220,7 +223,7 @@ jobs:
       stage: pip_package
       env: PYPI="https://upload.pypi.org/legacy/" TRAVIS_NOCACHE=$TRAVIS_JOB_ID
       install:
-        - doit develop_install $CHANS_DEV -o unit_tests && pip uninstall -y holoviews
+        - doit travis_wait 20 develop_install $CHANS_DEV -o unit_tests && pip uninstall -y holoviews
         - doit pip_on_conda
         - doit ecosystem=pip package_build
       script: doit ecosystem=pip package_upload -u $PPU -p $PPP -r ${PYPI}

doc/conf.py

@@ -10,8 +10,6 @@
 
 import holoviews
 version = release = holoviews.__version__
-if 'dirty' in version and 'post' not in version:
-    version = version[:-15] # Drop the commit hash and dirty string
 
 html_theme = 'sphinx_ioam_theme'
 html_static_path += ['_static']