Merge 9d06880 into eb854f8

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "doc/builder"]
-	path = doc/builder
-	url = https://github.com/ioam/ioam-builder.git

.travis.yml

@@ -3,20 +3,25 @@ sudo: false
 language: python
 
 # quick hack to determine what tag is (improvements welcomed)
-#     release: ^v(\d+|\.)*[^a-z]\d*$
-# dev release: ^v(\d+|\.)*[a-z]\d*$
+#     release: ^v(\d+|\.)+[^a-z]\d+$
+# dev release: ^v(\d+|\.)+[a-z]\d+$
 
 stages:
   - lint
   - test
   - name: pip_dev_package
-    if: tag =~ ^v(\d+|\.)*[a-z]\d*$
+    if: tag =~ ^v(\d+|\.)+[a-z]\d+$
   - name: pip_package
-    if: tag =~ ^v(\d+|\.)*[^a-z]\d*$
+    if: tag =~ ^v(\d+|\.)+[a-z]\d+$
   - name: conda_dev_package
-    if: tag =~ ^v(\d+|\.)*[a-z]\d*$ OR (branch = master AND type != pull_request)
+    if: tag =~ ^v(\d+|\.)+[a-z]\d+$
   - name: conda_package
-    if: tag =~ ^v(\d+|\.)*[^a-z]\d*$
+    if: tag =~ ^v(\d+|\.)+[a-z]\d+$
+  - name: website_dev
+    if: tag =~ ^v(\d+|\.)+[a-z]\d+$ OR tag = website_dev
+  - name: website_release
+    if: tag =~ ^v(\d+|\.)+[^a-z]\d+$ OR tag = website
+
 
 jobs:
   fast_finish: true
@@ -70,6 +75,7 @@ jobs:
     # failure uploading)
 
     - &conda_default
+      env: LABELS="--label dev"
       stage: conda_dev_package
       install:
         - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
@@ -81,14 +87,11 @@ jobs:
       script:
         - conda build conda.recipe/
       after_success:
-        # only upload if package doesn't exist (as e.g. there are cron builds)
-        - anaconda show pyviz/param/$(python setup.py --version) || anaconda --token $CONDA_UPLOAD_TOKEN upload --user pyviz --label dev $(conda build --output conda.recipe)
+        - anaconda --token $CONDA_UPLOAD_TOKEN upload --user pyviz $LABELS $(conda build --output conda.recipe)
 
     - <<: *conda_default
+      env: LABELS="--label dev --label main"
       stage: conda_package
-      after_success:
-        # error if there's an existing package with same version
-        - anaconda --token $CONDA_UPLOAD_TOKEN upload --user pyviz --label dev --label main $(conda build --output conda.recipe)
 
     - <<: *default
       stage: pip_dev_package
@@ -110,3 +113,47 @@ jobs:
           tags: true
         user: $PYPI_USER
         password: $PYPI_PWD
+
+    - &website
+      <<: *default
+      addons:
+        apt:
+          packages:
+          - graphviz
+      stage: website_release
+      before_install:
+        - pip install graphviz
+      install:
+        # TODO: just use pip install once nbsite 0.4.4 is out
+        - pip install --upgrade --pre --index-url=https://test.pypi.org/simple --extra-index-url=https://pypi.org/simple nbsite sphinx_ioam_theme
+        - pip install -e .
+      script:
+        # TODO: nbsite commands will be simplified eventually...
+        - nbsite generate-rst --org ioam --project-name param --repo param --examples=./examples --doc=./doc
+        - mkdir doc/Reference_Manual && nbsite_generate_modules.py param -d ./doc/Reference_Manual -n param -e tests
+        - nbsite build --what=html --examples=examples --doc=doc --output=builtdocs --examples-assets=''
+        - touch ./builtdocs/.nojekyll # for github pages
+        - nbsite_cleandisthtml.py ./builtdocs take_a_chance
+      deploy:
+        - provider: pages
+          skip_cleanup: true
+          github_token: $GITHUB_TOKEN
+          local_dir: ./builtdocs
+          repo: ioam-docs/param-tmp
+          fqdn: param.pyviz.org
+          on:
+            tags: true
+            all_branches: true
+
+    - <<: *website
+      stage: website_dev
+      env: DESC="ioam-docs.github.io/parambokeh-dev"
+      deploy:
+        - provider: pages
+          skip_cleanup: true
+          github_token: $GITHUB_TOKEN
+          local_dir: ./builtdocs
+          repo: ioam-docs/param-dev
+          on:
+            tags: true
+            all_branches: true

doc/conf.py

@@ -1,73 +1,39 @@
 # -*- coding: utf-8 -*-
 
-import sys, os
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+from nbsite.shared_conf import *
 
-from builder.shared_conf import *  # pyflakes:ignore (API import)
-
-paths = ['.', '..']
-add_paths(paths)
-
-# General information about the project.
 project = u'Param'
-copyright = u'\u00a9 2003-2018, IOAM'
-ioam_project = 'param'
-from param import __version__
-
-
-# The version info for the project being documented, defining |version|
-# and |release| and used in various other places throughout the built
-# documents.  Assumes __version__ is a param.version.Version object.
-#
-# The short X.Y.Z version.
-version = __version__.abbrev()
-
-# The full version, including alpha/beta/rc/dev tags.
-release = __version__.abbrev(dev_suffix="-dev")
-
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static', 'builder/_shared_static']
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = project + 'doc'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  ('index', project+'.tex', project + ' Documentation',
-   u'IOAM', 'manual'),
-]
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', ioam_project, project + ' Documentation',
-     [u'IOAM'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', project, project + ' Documentation',
-   u'IOAM', project, 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+authors = u'PyViz authors'
+copyright = u'\u00a9 2005-2018, ' + authors
+description = 'Declarative Python programming using Parameters.'
+
+import param
+version = release = param.__version__
+
+html_static_path += ['_static']
+html_theme = 'sphinx_ioam_theme'
+html_theme_options = {
+    'logo':'logo.png',
+    'favicon':'favicon.ico',
+#    'css':'site.css'
+}
+
+_NAV =  (
+    ('API', 'Reference_Manual/param'),
+    ('About', 'About'),
+)
+
+html_context.update({
+    'PROJECT': project,
+    'DESCRIPTION': description,
+    'AUTHOR': authors,
+    # canonical URL (for search engines); can ignore for local builds
+    'WEBSITE_SERVER': 'https://param.pyviz.org',
+    'VERSION': version,
+    'NAV': _NAV,
+    'LINKS': _NAV,
+    'SOCIAL': (
+        ('Gitter', '//gitter.im/ioam/holoviews'),
+        ('Github', '//github.com/ioam/param'),
+    )
+})