From 2faad2d9299de8a094248e1d44d6e6522de3e6f4 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Jan 09 2017 17:15:36 +0000
Subject: [PATCH 1/2] Use napoleon from Sphinx instead of contrib.


Napoleon has been part of Sphinx since 1.3.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

---

diff --git a/docs/conf.py b/docs/conf.py
index 50c5fae..0d0c403 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -34,7 +34,7 @@ extensions = [
     'sphinx.ext.doctest',
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/setup.py b/setup.py
index 1df5800..a0d57ab 100644
--- a/setup.py
+++ b/setup.py
@@ -48,5 +48,5 @@ setup(
     maintainer_email=MAINTAINER_EMAIL, platforms=PLATFORMS, url=URL, keywords='fedora',
     packages=find_packages(exclude=('fegistry.tests', 'fegistry.tests.*')),
     include_package_data=True, zip_safe=False, install_requires=['flask'],
-    tests_require=['flake8', 'mock', 'nose', 'nose-cov', 'sphinxcontrib-napoleon'],
+    tests_require=['flake8', 'mock', 'nose', 'nose-cov'],
     test_suite="nose.collector")

From 62adc6ced51b7e151e56936bf9e851c25877d4dc Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Jan 09 2017 17:15:39 +0000
Subject: [PATCH 2/2] Alphabetize the list of Sphinx extensions.


Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

---

diff --git a/docs/conf.py b/docs/conf.py
index 0d0c403..f768fc0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -32,9 +32,9 @@ import fegistry
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
-    'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
     'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
 ]
 
 # Add any paths that contain templates here, relative to this directory.