Switch to using sphinx_holoviz_theme and fixing up holoviz references (#150)

Author: jsignell

README.md

@@ -6,18 +6,18 @@
 
 |    |    |
 | --- | --- |
-| Build Status | [![Linux/MacOS Build Status](https://travis-ci.org/pyviz/nbsite.svg?branch=master)](https://travis-ci.org/pyviz/nbsite) [![Windows Build status](https://img.shields.io/appveyor/ci/pyviz/nbsite/master.svg?logo=appveyor)](https://ci.appveyor.com/project/pyviz/nbsite/branch/master) |
-| Coverage | [![codecov](https://codecov.io/gh/pyviz/nbsite/branch/master/graph/badge.svg)](https://codecov.io/gh/pyviz/nbsite) |
-| Latest dev release | [![Github tag](https://img.shields.io/github/tag/pyviz/nbsite.svg?label=tag&colorB=11ccbb)](https://github.com/pyviz/nbsite/tags) |
-| Latest release | [![Github release](https://img.shields.io/github/release/pyviz/nbsite.svg?label=tag&colorB=11ccbb)](https://github.com/pyviz/nbsite/releases) [![PyPI version](https://img.shields.io/pypi/v/nbsite.svg?colorB=cc77dd)](https://pypi.python.org/pypi/nbsite) [![nbsite version](https://img.shields.io/conda/v/pyviz/nbsite.svg?colorB=4488ff&style=flat)](https://anaconda.org/pyviz/nbsite) [![conda-forge version](https://img.shields.io/conda/v/conda-forge/nbsite.svg?label=conda%7Cconda-forge&colorB=4488ff)](https://anaconda.org/conda-forge/nbsite) [![defaults version](https://img.shields.io/conda/v/anaconda/nbsite.svg?label=conda%7Cdefaults&style=flat&colorB=4488ff)](https://anaconda.org/anaconda/nbsite) |
+| Build Status | [![Linux/MacOS Build Status](https://travis-ci.org/pyviz-dev/nbsite.svg?branch=master)](https://travis-ci.org/pyviz-dev/nbsite) [![Windows Build status](https://img.shields.io/appveyor/ci/pyviz-dev/nbsite/master.svg?logo=appveyor)](https://ci.appveyor.com/project/pyviz-dev/nbsite/branch/master) |
+| Coverage | [![codecov](https://codecov.io/gh/pyviz-dev/nbsite/branch/master/graph/badge.svg)](https://codecov.io/gh/pyviz-dev/nbsite) |
+| Latest dev release | [![Github tag](https://img.shields.io/github/tag/pyviz-dev/nbsite.svg?label=tag&colorB=11ccbb)](https://github.com/pyviz-dev/nbsite/tags) |
+| Latest release | [![Github release](https://img.shields.io/github/release/pyviz-dev/nbsite.svg?label=tag&colorB=11ccbb)](https://github.com/pyviz-dev/nbsite/releases) [![PyPI version](https://img.shields.io/pypi/v/nbsite.svg?colorB=cc77dd)](https://pypi.python.org/pypi/nbsite) [![nbsite version](https://img.shields.io/conda/v/pyviz/nbsite.svg?colorB=4488ff&style=flat)](https://anaconda.org/pyviz/nbsite) [![conda-forge version](https://img.shields.io/conda/v/conda-forge/nbsite.svg?label=conda%7Cconda-forge&colorB=4488ff)](https://anaconda.org/conda-forge/nbsite) [![defaults version](https://img.shields.io/conda/v/anaconda/nbsite.svg?label=conda%7Cdefaults&style=flat&colorB=4488ff)](https://anaconda.org/anaconda/nbsite) |
 | Docs | [![gh-pages](https://img.shields.io/github/last-commit/pyviz/nbsite/gh-pages.svg)](https://github.com/pyviz/nbsite/tree/gh-pages) [![site](https://img.shields.io/website-up-down-green-red/https/nbsite.pyviz.org.svg)](https://nbsite.pyviz.org) |
 
 ## What is it?
 
 NBSite lets you build a website from a set of notebooks plus a minimal
 amount of config. Sites built with nbsite include
 [pyviz.org](https://pyviz.org),
-[datashader.org](http://datashader.org/), and [hvplot.pyviz.org](https:/hvplot.pyviz.org).
+[datashader.org](https://datashader.org/), and [hvplot.pyviz.org](https:/hvplot.pyviz.org).
 
 The idea behind nbsite is that notebooks can simultaneously be
 documentation (things you want to tell people about), examples (a

doc/conf.py

@@ -14,7 +14,7 @@
 version = release = nbsite.__version__
 
 html_static_path += ['_static']
-html_theme = 'sphinx_pyviz_theme'
+html_theme = 'sphinx_holoviz_theme'
 html_theme_options = {
     'custom_css': 'site.css',
     'logo': 'nbsite-logo.png',

examples/Development.ipynb

@@ -17,7 +17,7 @@
     "\n",
     "(todo, see travis for commands to run locally)\n",
     "\n",
-    "Update pyviz.github.io/nbsite: `git tag -a x.y.z -m \"message\" && git push --tags`\n"
+    "Update nbsite.pyviz.org: `git tag -a x.y.z -m \"message\" && git push --tags`\n"
    ]
   },
   {

examples/Usage.ipynb

@@ -45,7 +45,7 @@
     "\n",
     "You can skip and/or modify various steps below depending on what you already have. If you do skip this steps you will need to at least create a doc dir with a conf.py in it. See nbsite/templates/basic for an example.\n",
     "\n",
-    "1. Create a set of basic pages: `nbsite init` (will not overwrite existing files). Use the `--theme` option to specify if you want the pyviz setup.\n",
+    "1. Create a set of basic pages: `nbsite init` (will not overwrite existing files). Use the `--theme` option to specify if you want the holoviz setup.\n",
     "\n",
     "2. Edit conf.py as appropriate for your project.\n",
     "\n",
@@ -101,19 +101,19 @@
    "metadata": {},
    "source": [
     "## Customizing Style\n",
-    "For all the sites that have been generated so far, we used the `sphinx_pyviz_theme`. You may be able to use a different theme (untested).\n",
+    "For most of the sites that have been generated so far, we used the `sphinx_holoviz_theme`. [PyViz](https://pyviz.org) is the exception and uses the Alabaster theme.\n",
     "\n",
     "\n",
-    "### PyViz\n",
+    "### HoloViz\n",
     "\n",
-    "To use the pyviz theme: pip/conda install sphinx_pyviz_theme and set `html_theme` to `sphinx_pyviz_theme`. To control the look and feel, change `html_theme_options` in conf.py:\n",
+    "To use the holoviz theme: pip/conda install sphinx_holoviz_theme and set `html_theme` to `sphinx_holoviz_theme`. To control the look and feel, change `html_theme_options` in conf.py:\n",
     "\n",
     "* `logo` and `favicon`: provide paths relative to `html_static_path` (`doc/_static` by default)\n",
     "* `primary_color`, `primary_color_dark` and `secondary_color`: control the colors that the website uses for header, nav, links... These can be css named colors, or hex colors.\n",
     "* `second_nav`: Boolean indicating whether to use a second nav bar.\n",
     "* `custom_css`: path relative to `html_static_path` overriding styles. Styles come first from the theme's `main.css_t`, which is populated with the colors options, extended/overridden by nbsite's own css `nbsite/_shared_static/nbsite.css`, and then extended/overridden by your site's own css. \n",
     "\n",
-    "**NOTE:** Only use the custom_css to overwrite small pieces of the css not to make general improvements. If you have general improvements, please open a PR on the [theme repo](https://github.com/pyviz-dev/sphinx_pyviz_theme).\n",
+    "**NOTE:** Only use the custom_css to overwrite small pieces of the css not to make general improvements. If you have general improvements, please open a PR on the [theme repo](https://github.com/pyviz-dev/sphinx_holoviz_theme).\n",
     "\n",
     "## Customizing running of IPython notebooks\n",
     "\n",

nbsite/__main__.py

@@ -22,7 +22,7 @@ def main(args=None):
 
     init_parser = subparsers.add_parser("init", help=inspect.getdoc(init))
     _add_common_args(init_parser,'--project-root','--doc')
-    init_parser.add_argument('--theme', type=str, help='sphinx theme to use in template', choices=['pyviz', ''], default='')
+    init_parser.add_argument('--theme', type=str, help='sphinx theme to use in template', choices=['holoviz', ''], default='')
     _set_defaults(init_parser,init)
 
     generaterst_parser = subparsers.add_parser("generate-rst", help=inspect.getdoc(generate_rst))

nbsite/templates/pyviz/README.md nbsite/templates/holoviz/README.mdnbsite/templates/pyviz/README.md renamed to nbsite/templates/holoviz/README.md

@@ -2,9 +2,10 @@ About PROJECT
 =============
 
 PROJECT is supported and maintained by `Anaconda
-<https://www.anaconda.com>`_.  PROJECT is part of the `PyViz
-<https://pyviz.org>`_ project to make Python data visualization tools
-simpler and more powerful.
+<https://www.anaconda.com>`_.  PROJECT is part of the `HoloViz
+<https://holoviz.org>`_ ecosystem, which strives to make browser-based
+ data visualization in Python easier to use, easier to learn, and more
+ powerful.
 
 The primary PyViz developers are Philipp Rudiger, James A. Bednar,
 Julia Signell and Jean-Luc Stevens, with bug reports and patches from

nbsite/templates/pyviz/about.rst nbsite/templates/holoviz/about.rstnbsite/templates/pyviz/about.rst renamed to nbsite/templates/holoviz/about.rst

@@ -7,14 +7,14 @@
 # edit things below as appropriate for your project
 
 project = u'Project'
-authors = u'PyViz Developers'
+authors = u'HoloViz Developers'
 copyright = u'2019 ' + authors
 description = 'Short description for html meta description.'
 site = 'https://{}.pyviz.org'.format(project)
 version = release = '0.0.1'
 
 html_static_path += ['_static']
-html_theme = 'sphinx_pyviz_theme'
+html_theme = 'sphinx_holoviz_theme'
 # logo file etc should be in html_static_path, e.g. _static
 # only change colors in primary, primary_dark, and secondary
 html_theme_options = {
@@ -47,7 +47,7 @@
     'LINKS': _NAV,
     'SOCIAL': (
         ('Gitter', 'https://gitter.im/pyviz/pyviz'),
-        ('Twitter', 'https://twitter.com/pyviz_org'),
-        ('Github', 'https://github.com/pyviz/{}'.format(project)),
+        ('Twitter', 'https://twitter.com/holoviz_org'),
+        ('Github', 'https://github.com/holoviz/{}'.format(project)),
     )
 })

nbsite/templates/pyviz/conf.py nbsite/templates/holoviz/conf.pynbsite/templates/pyviz/conf.py renamed to nbsite/templates/holoviz/conf.py

@@ -495,4 +495,4 @@ def test_build_with_keep_numbers_passes_even_when_link_target_does_not_exist(tmp
     html = (project / "builtdocs" / "1_First_Notebook.html").read_text()
     assert '<a href="0_Zeroth_Notebook.html">right number</a>' in html
     assert '<a href="1_Zeroth_Notebook.html">wrong number</a>' in html
-    assert '<a href="Zeroth_Notebook.html">no number</a>' in html
+    assert '<a href="Zeroth_Notebook.html">no number</a>' in html