Merge pull request #2660 from mgeier/doc-changes

DOC: Clean up settings

Author: pbugnion

docs/environment.yml

@@ -5,7 +5,6 @@ channels:
 dependencies:
 - ipykernel
 - jinja2
-- jupyter_sphinx
 - ipywidgets
 - bqplot
 - numpy
@@ -19,5 +18,5 @@ dependencies:
 - python-dateutil
 - recommonmark
 - matplotlib
-- bqplot
-- numpy
+- ipyleaflet
+- pandas

docs/requirements.txt

@@ -3,11 +3,10 @@ ipywidgets>=7.5.0
 bqplot
 numpy
 jupyter_client
-jupyter_sphinx
 nbsphinx>=0.2.13
 recommonmark
 sphinx>=1.4.6
 sphinx_rtd_theme
 matplotlib
-numpy
-bqplot
+ipyleaflet
+pandas

docs/source/conf.py

@@ -1,25 +1,6 @@
 #!/usr/bin/env python3
 #
 
-import os
-import subprocess
-import sys
-
-
-# -- path -------------------------------------------------------
-
-from os.path import dirname
-docs = dirname(dirname(__file__))
-root = dirname(docs)
-sys.path.insert(0, root)
-
-
-# -- bash utility function --------------------------------------
-def bash(filename):
-    """Runs a bash script in the local directory"""
-    sys.stdout.flush()
-    subprocess.call("bash {}".format(filename), shell=True)
-
 
 # -- source files and parsers -----------------------------------
 
@@ -37,7 +18,6 @@ def bash(filename):
     'sphinx.ext.intersphinx',
     'sphinx.ext.mathjax',
     'nbsphinx',
-    'jupyter_sphinx.execute',
     'IPython.sphinxext.ipython_console_highlighting',
     'recommonmark',
 ]
@@ -49,10 +29,7 @@ def bash(filename):
     'jupyter': ('https://jupyter.readthedocs.io/en/latest/', None),
 }
 
-nbsphinx_allow_errors = True   # exception ipstruct.py ipython_genutils
 nbsphinx_execute = 'always'
-# Disable including require.js because it is also included by jupyter_sphinx:
-nbsphinx_requirejs_path = ''
 
 # -- General information -------
 

docs/source/developer_docs.rst

@@ -7,7 +7,7 @@ The Jupyter widgets packages are developed in the `https://github.com/jupyter-wi
 Scope of ipywidgets
 -------------------
 
-``ipywidgets`` is a framework to provide eventful python objects that have a representation in the browser (see :doc:`examples/Widget Basics.ipynb` for more on the definition of widgets). This requires two components:
+``ipywidgets`` is a framework to provide eventful python objects that have a representation in the browser (see :doc:`examples/Widget Basics` for more on the definition of widgets). This requires two components:
 
 1. The framework for widget interactions between the widgets represented in the Python kernel and the (javascript) representation of the widgets in the browser.
 2. A basic, lightweight set of form controls that *use* this framework, based on standard HTML form controls. These included controls include a text area, text box, select and multiselect controls, checkbox, etc. A few more advanced controls that are very popular are also included, such as a slider and basic tab panels.

docs/source/examples/Layout Example.ipynb

@@ -310,6 +310,7 @@
    "version": "3.7.2"
   },
   "nbsphinx": {
+   "execute": "never",
    "orphan": true
   }
  },

docs/source/examples/Output Widget.ipynb

@@ -153,7 +153,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "raises-exception"
+    ]
+   },
    "outputs": [],
    "source": [
     "@out.capture()\n",

docs/source/examples/Widget Styling.ipynb

@@ -15,12 +15,12 @@
    "source": [
     "You can jump directly to these sections:\n",
     "\n",
-    "+ [The `layout` attribute](#The-layout-attribute)\n",
+    "+ [The layout attribute](#The-layout-attribute)\n",
     "+ [The Flexbox layout](#The-Flexbox-layout)\n",
     "+ [Predefined styles](#Predefined-styles)\n",
-    "+ [The `style` attribute](#The-style-attribute)\n",
+    "+ [The style attribute](#The-style-attribute)\n",
     "+ [The Grid layout](#The-Grid-layout)\n",
-    "+ [`Image` layout and sizing](#Image-layout-and-sizing)"
+    "+ [Image layout and sizing](#Image-layout-and-sizing)"
    ]
   },
   {