Merge pull request #3094 from willingc/7.x-docs

Align doc requirements for 7.x branch with master

docs/requirements.txt

@@ -1,13 +1,10 @@
-ipykernel
-ipywidgets>=7.5.0
 bqplot
-numpy
+ipykernel
+ipyleaflet
 jupyter_client
-jupyter_sphinx
-nbsphinx>=0.2.13
+matplotlib
+nbsphinx>=0.5
+numpy
 recommonmark
 sphinx>=1.4.6
 sphinx_rtd_theme
-matplotlib
-numpy
-bqplot

docs/source/conf.py

@@ -1,26 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-#
-
-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 -----------------------------------
 
@@ -38,7 +17,6 @@ def bash(filename):
     'sphinx.ext.intersphinx',
     'sphinx.ext.mathjax',
     'nbsphinx',
-    'jupyter_sphinx',
     'IPython.sphinxext.ipython_console_highlighting',
     'recommonmark',
 ]
@@ -50,10 +28,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 -------
 

readthedocs.yml

@@ -1,4 +1,7 @@
-conda:
-    file: docs/environment.yml
+version: 2
 python:
-    version: 3
+    version: 3.7
+    install:
+      - method: setuptools
+        path: .
+      - requirements: docs/requirements.txt