From 6548d44f3bee349e8edad55a1577ba5501f67a91 Mon Sep 17 00:00:00 2001
From: Michael Clerx <michael.clerx@cs.ox.ac.uk>
Date: Tue, 18 Sep 2018 15:04:59 +0100
Subject: [PATCH] Updated sphinx config to work with version 1.8 and up.

---
 docs/source/conf.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 119195b7e..c5f2b06b3 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -19,6 +19,7 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
+import sphinx
 import guzzle_sphinx_theme
 
 # -- General configuration ------------------------------------------------
@@ -37,11 +38,17 @@
 ]
 
 # Autodoc defaults
-autodoc_default_flags = [
-    'members',
-    'inherited-members',
-    # 'show-inheritance',
-]
+if int(sphinx.__version__.split('.')[1]) < 8:
+    autodoc_default_flags = [
+        'members',
+        'inherited-members',
+        # 'show-inheritance',
+    ]
+else:
+    autodoc_default_options = {
+        'members': None,
+        'inherited-members': None,
+    }
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -176,5 +183,3 @@
      'Miscellaneous'),
 ]
 
-
-