Merge f81b5cb into ff26fed

.travis.yml

@@ -23,7 +23,7 @@ env:
     - CHANS_DEV="-c pyviz/label/dev -c conda-forge"
     - CHANS="-c pyviz"
     - MPLBACKEND="Agg"
-    - PYTHON_VERSION=3.6
+    - PYTHON_VERSION=3.7
 
 stages:
   - test
@@ -46,9 +46,9 @@ stages:
   - name: gallery_dev
     if: tag =~ ^v(\d+|\.)*[a-z]\d*$
   - name: docs_daily
-    if: (type = cron OR commit_message =~ /\[doc-build\]/)
+    if: ((type = cron) OR ((commit_message =~ /\[doc-build\]/) and branch = master))
   - name: gallery_daily
-    if: (type = cron OR commit_message =~ /\[doc-build\]/)
+    if: ((type = cron) OR ((commit_message =~ /\[doc-build\]/) and branch = master))
 
 jobs:
   include:
@@ -80,16 +80,17 @@ jobs:
       stage: extra_tests
       env: DESC="Basic dependencies" HV_REQUIREMENTS="basic_tests"
       after_success: echo "Success"
+      script:
+        - doit test_unit
 
     ########## DOCS ##########
 
     - &doc_build
       <<: *default
       stage: docs_dev
-      env: DESC="docs" CHANS_DEV="-c pyviz/label/dev" HV_DOC_GALLERY='false' HV_DOC_REF_GALLERY='false' HV_REQUIREMENTS="doc" PANEL_EMBED='true' PANEL_EMBED_JSON='true' PANEL_EMBED_JSON_PREFIX='json'
+      env: DESC="docs" HV_DOC_GALLERY="false" HV_DOC_REF_GALLERY="true" HV_REQUIREMENTS="doc" PANEL_EMBED="true" PANEL_EMBED_JSON="true" PANEL_EMBED_JSON_PREFIX="json"
       script:
         - bokeh sampledata
-        - conda install -c conda-forge awscli
         - nbsite generate-rst --org pyviz --project-name holoviews --skip ^reference
         - nbsite build --what=html --output=builtdocs
       after_success:
@@ -98,11 +99,9 @@ jobs:
     - &gallery_build
       <<: *doc_build
       stage: gallery_dev
-      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_REQUIREMENTS="doc" BUCKET="dev."
+      env: DESC="gallery" HV_DOC_GALLERY="true" HV_DOC_REF_GALLERY="false" BUCKET="dev." HV_REQUIREMENTS="doc" PANEL_EMBED="true" PANEL_EMBED_JSON="true" PANEL_EMBED_JSON_PREFIX="json"
       script:
         - bokeh sampledata
-        - conda install -c conda-forge 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
@@ -115,14 +114,14 @@ jobs:
 
     - <<: *gallery_build
       stage: gallery_daily
-      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_DOC_GALLERY='false' HV_DOC_REF_GALLERY='false' HV_REQUIREMENTS="doc" BUCKET="build."
+      env: DESC="gallery" HV_DOC_GALLERY="false" HV_DOC_REF_GALLERY="true" BUCKET="build." HV_REQUIREMENTS="doc" PANEL_EMBED="true" PANEL_EMBED_JSON="true" PANEL_EMBED_JSON_PREFIX="json"
 
     - <<: *doc_build
       stage: docs
 
     - <<: *gallery_build
       stage: gallery
-      env: DESC="gallery" CHANS_DEV="-c pyviz/label/dev" HV_REQUIREMENTS="doc"
+      env: DESC="gallery" HV_DOC_GALLERY="true" HV_DOC_REF_GALLERY="false" HV_REQUIREMENTS="doc" PANEL_EMBED="true" PANEL_EMBED_JSON="true" PANEL_EMBED_JSON_PREFIX="json"
       after_success:
         - aws s3 sync ./builtdocs s3://holoviews.org/
 

doc/conf.py

@@ -17,16 +17,14 @@
     'logo': 'logo.png',
     'favicon': 'favicon.ico',
     'custom_css': 'holoviews.css',
-    'include_logo_text': False,
+    'include_logo_text': True,
     'second_nav': True,
     'footer': False
 }
 nbbuild_cell_timeout = 360
 
 extensions += ['nbsite.gallery']
 
-templates_path = ['_templates']
-
 nbsite_gallery_conf = {
     'backends': ['bokeh', 'matplotlib', 'plotly'],
     'galleries': {},

setup.py

@@ -49,7 +49,7 @@
     'cyordereddict', 'ipython==5.4.1']
 
 extras_require['doc'] = extras_require['examples'] + [
-    'nbsite>0.5.2', 'sphinx', 'sphinx_holoviz_theme']
+    'nbsite>0.5.2', 'sphinx', 'sphinx_holoviz_theme', 'mpl_sample_data', 'awscli']
 
 extras_require['build'] = ['param >=1.7.0', 'setuptools']