Cleanup cruft (#371)

Author: jarrodmillman

doc/conf.py

@@ -15,7 +15,6 @@
 from datetime import date
 import sys
 import os
-import re
 
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -46,15 +45,9 @@
     'numpydoc',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
+    'sphinx.ext.imgmath',
 ]
 
-try:
-    import sphinx.ext.imgmath  # noqa
-except ImportError:
-    extensions.append('sphinx.ext.pngmath')
-else:
-    extensions.append('sphinx.ext.imgmath')
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -81,8 +74,7 @@
 # version = .__version__
 # The full version, including alpha/beta/rc tags.
 release = numpydoc.__version__
-version = re.sub(r'(\d+\.\d+)\.\d+(.*)', r'\1\2', numpydoc.__version__)
-version = re.sub(r'(\.dev\d+).*?$', r'\1', version)
+version = numpydoc.__version__
 numpydoc_xref_param_type = True
 numpydoc_xref_ignore = {'optional', 'type_without_description', 'BadException'}
 # Run docstring validation as part of build process

numpydoc/numpydoc.py

@@ -244,14 +244,7 @@ def setup(app, get_doc_object_=get_doc_object):
     get_doc_object = get_doc_object_
 
     app.setup_extension('sphinx.ext.autosummary')
-
-    # Once we bump our Sphinx requirement higher (1.7 or 1.8?)
-    # we can just connect to config-inited
-    try:
-        app.connect('config-inited', update_config)
-    except ExtensionError:
-        app.connect('builder-inited', update_config)
-
+    app.connect('config-inited', update_config)
     app.connect('autodoc-process-docstring', mangle_docstrings)
     app.connect('autodoc-process-signature', mangle_signature)
     app.connect('doctree-read', relabel_references)