From 6e527e91fe1eba26a9c9d1b9c45524fdfc072c52 Mon Sep 17 00:00:00 2001
From: Rob Redpath <rob.redpath@opendataservices.coop>
Date: Mon, 23 Nov 2020 15:50:19 +0000
Subject: [PATCH] Update conf & reqs for RTD

---
 docs/conf.py     |  6 +---
 requirements.txt | 87 +++++++++++++++++++++++++++++++-----------------
 2 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7afed00..c9443f5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,6 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 from recommonmark.transform import AutoStructify
-from recommonmark.parser import CommonMarkParser
 import os 
 
 # -- General configuration ------------------------------------------------
@@ -33,7 +32,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinxcontrib.openapi', 'sphinxcontrib.opendataservices']
+extensions = ['recommonmark', 'sphinxcontrib.openapi', 'sphinxcontrib.opendataservices']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -42,9 +41,6 @@
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_parsers = {
-    '.md': CommonMarkParser,
-    }
 
 source_suffix = ['.rst', '.md']
 
diff --git a/requirements.txt b/requirements.txt
index 887d859..3b406c9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,31 +1,56 @@
-Sphinx==1.6.2
-sphinx-intl==0.9.9
-transifex-client==0.12.4
-sphinx-rtd-theme==0.2.4
-# recommonmark commit pinned from master branch
--e git+https://github.com/rtfd/recommonmark.git@c410abb565a3c4ad4de0ce204ab2fa2db8031cf1#egg=recommonmark
-# sphinxcontrib jsonschema
--e git+https://github.com/OpenDataServices/sphinxcontrib-jsonschema.git@a1e21704186b8e46f161a5b29c3f7bfeace5ca09#egg=sphinxcontrib-jsonschema
-# sphinxcontrib ODSC
--e git+https://github.com/OpenDataServices/sphinxcontrib-opendataservices.git@23ce17656feaa237584af8822bd57ac39b498f93#egg=sphinxcontrib-opendataservices
--e git+https://github.com/OpenDataServices/sphinxcontrib-openapi.git@c0637fc35509fd93fa3c6f6cd6583154c60616df#egg=sphinxcontrib_openapi
-## The following requirements were added by pip freeze:
-alabaster==0.7.10
-Babel==2.4.0
-certifi==2017.4.17
-chardet==3.0.4
-click==6.7
-CommonMark==0.7.3
-docutils==0.13.1
-future==0.16.0
-idna==2.5
-imagesize==0.7.1
-Jinja2==2.9.6
-MarkupSafe==1.0
-Pygments==2.2.0
-pytz==2017.2
-requests==2.18.1
-six==1.10.0
-snowballstemmer==1.2.1
-sphinxcontrib-websupport==1.0.1
-urllib3==1.22
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile
+#
+-e git+https://github.com/OpenDataServices/sphinxcontrib-jsonschema.git@a1e21704186b8e46f161a5b29c3f7bfeace5ca09#egg=sphinxcontrib-jsonschema  # via -r requirements.in
+-e git+https://github.com/OpenDataServices/sphinxcontrib-opendataservices.git@bc2f9a83a2562a50aa9386fb9c1d30161ed5120e#egg=sphinxcontrib-opendataservices  # via -r requirements.in
+-e git+https://github.com/OpenDataServices/sphinxcontrib-openapi.git@c0637fc35509fd93fa3c6f6cd6583154c60616df#egg=sphinxcontrib_openapi  # via -r requirements.in
+alabaster==0.7.12         # via sphinx
+attrs==19.3.0             # via jsonschema
+babel==2.8.0              # via sphinx, sphinx-intl
+certifi==2020.6.20        # via requests
+chardet==3.0.4            # via requests
+click==7.1.2              # via sphinx-intl
+commonmark==0.9.1         # via recommonmark
+docutils==0.13.1          # via -r requirements.in, recommonmark, sphinx
+git+https://github.com/OpenDataServices/erd-from-json-table-schema.git  # via -r requirements.in
+gitdb==4.0.5              # via gitpython
+gitpython==3.1.3          # via transifex-client
+idna==2.10                # via requests
+imagesize==1.2.0          # via sphinx
+jinja2==2.11.2            # via sphinx
+jsonpointer==2.0          # via sphinxcontrib-jsonschema, sphinxcontrib-opendataservices
+jsonref==0.2              # via sphinxcontrib-jsonschema
+jsonschema==3.2.0         # via sphinxcontrib-openapi
+markupsafe==1.1.1         # via jinja2
+packaging==20.4           # via sphinx
+pygments==2.6.1           # via sphinx
+pygraphviz==1.6           # via erd-from-json-table-schema
+pyparsing==2.4.7          # via packaging
+pyrsistent==0.16.0        # via jsonschema
+python-slugify==4.0.1     # via transifex-client
+pytz==2020.1              # via babel
+pyyaml==5.3.1             # via sphinxcontrib-openapi
+recommonmark==0.6.0       # via -r requirements.in, sphinxcontrib-opendataservices
+requests==2.24.0          # via sphinx, transifex-client
+six==1.15.0               # via jsonschema, packaging, pyrsistent, sphinxcontrib-httpdomain, transifex-client
+smmap==3.0.4              # via gitdb
+snowballstemmer==2.0.0    # via sphinx
+sphinx-intl==2.0.1        # via -r requirements.in
+sphinx-rtd-theme==0.2.4   # via -r requirements.in
+sphinx==3.1.2             # via -r requirements.in, recommonmark, sphinx-intl, sphinxcontrib-httpdomain, sphinxcontrib-jsonschema, sphinxcontrib-opendataservices
+sphinxcontrib-applehelp==1.0.2  # via sphinx
+sphinxcontrib-devhelp==1.0.2  # via sphinx
+sphinxcontrib-htmlhelp==1.0.3  # via sphinx
+sphinxcontrib-httpdomain==1.7.0  # via sphinxcontrib-openapi
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.3  # via sphinx
+sphinxcontrib-serializinghtml==1.1.4  # via sphinx
+text-unidecode==1.3       # via python-slugify
+transifex-client==0.13.11  # via -r requirements.in
+urllib3==1.25.9           # via requests, transifex-client
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools