Replace instances of astropy_helpers.sphinx.ext with sphinx_automodapi

astrofrog · astrofrog · commit d0be6fa8b7eb · 2016-11-06T13:16:59.000Z
diff --git a/sphinx_automodapi/automodapi.py b/sphinx_automodapi/automodapi.py
@@ -379,7 +379,7 @@ def process_automodapi(app, docname, source):
 
 def setup(app):
     # need automodsumm for automodapi
-    app.setup_extension('astropy_helpers.sphinx.ext.automodsumm')
+    app.setup_extension('sphinx_automodapi.automodsumm')
 
     app.connect('source-read', process_automodapi)
 
diff --git a/sphinx_automodapi/automodsumm.py b/sphinx_automodapi/automodsumm.py
@@ -308,8 +308,8 @@ def automodsumm_to_autosummary_lines(fn, app):
     fullfn = os.path.join(app.builder.env.srcdir, fn)
 
     with open(fullfn) as fr:
-        if 'astropy_helpers.sphinx.ext.automodapi' in app._extensions:
-            from astropy_helpers.sphinx.ext.automodapi import automodapi_replace
+        if 'sphinx_automodapi.automodapi' in app._extensions:
+            from sphinx_automodapi.automodapi import automodapi_replace
             # Must do the automodapi on the source to get the automodsumm
             # that might be in there
             docname = os.path.splitext(fn)[0]
@@ -621,8 +621,8 @@ def get_members_class(obj, typ, include_public=[],
 
 def setup(app):
     # need our autosummary and autodoc fixes
-    app.setup_extension('astropy_helpers.sphinx.ext.astropyautosummary')
-    app.setup_extension('astropy_helpers.sphinx.ext.autodoc_enhancements')
+    app.setup_extension('sphinx_automodapi.astropyautosummary')
+    app.setup_extension('sphinx_automodapi.autodoc_enhancements')
     # need inheritance-diagram for automod-diagram
     app.setup_extension('sphinx.ext.inheritance_diagram')
 
diff --git a/sphinx_automodapi/tests/test_automodapi.py b/sphinx_automodapi/tests/test_automodapi.py
@@ -48,7 +48,7 @@ def warn(self, msg, loc):
 am_replacer_str = """
 This comes before
 
-.. automodapi:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodapi:: sphinx_automodapi.tests.test_automodapi
 {options}
 
 This comes after
@@ -57,29 +57,29 @@ def warn(self, msg, loc):
 am_replacer_basic_expected = """
 This comes before
 
-astropy_helpers.sphinx.ext.tests.test_automodapi Module
+sphinx_automodapi.tests.test_automodapi Module
 -------------------------------------------------------
 
-.. automodule:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodule:: sphinx_automodapi.tests.test_automodapi
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodsumm:: sphinx_automodapi.tests.test_automodapi
     :functions-only:
     :toctree: api/
 
 Classes
 ^^^^^^^
 
-.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodsumm:: sphinx_automodapi.tests.test_automodapi
     :classes-only:
     :toctree: api/
 
 Class Inheritance Diagram
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. automod-diagram:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automod-diagram:: sphinx_automodapi.tests.test_automodapi
     :private-bases:
     :parts: 1
     {empty}
@@ -104,22 +104,22 @@ def test_am_replacer_basic():
 am_replacer_noinh_expected = """
 This comes before
 
-astropy_helpers.sphinx.ext.tests.test_automodapi Module
+sphinx_automodapi.tests.test_automodapi Module
 -------------------------------------------------------
 
-.. automodule:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodule:: sphinx_automodapi.tests.test_automodapi
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodsumm:: sphinx_automodapi.tests.test_automodapi
     :functions-only:
     :toctree: api/
 
 Classes
 ^^^^^^^
 
-.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodsumm:: sphinx_automodapi.tests.test_automodapi
     :classes-only:
     :toctree: api/
 
@@ -145,29 +145,29 @@ def test_am_replacer_noinh():
 am_replacer_titleandhdrs_expected = """
 This comes before
 
-astropy_helpers.sphinx.ext.tests.test_automodapi Module
+sphinx_automodapi.tests.test_automodapi Module
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
 
-.. automodule:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodule:: sphinx_automodapi.tests.test_automodapi
 
 Functions
 *********
 
-.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodsumm:: sphinx_automodapi.tests.test_automodapi
     :functions-only:
     :toctree: api/
 
 Classes
 *******
 
-.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automodsumm:: sphinx_automodapi.tests.test_automodapi
     :classes-only:
     :toctree: api/
 
 Class Inheritance Diagram
 *************************
 
-.. automod-diagram:: astropy_helpers.sphinx.ext.tests.test_automodapi
+.. automod-diagram:: sphinx_automodapi.tests.test_automodapi
     :private-bases:
     :parts: 1
     {empty}
@@ -195,7 +195,7 @@ def test_am_replacer_titleandhdrs():
 am_replacer_nomain_str = """
 This comes before
 
-.. automodapi:: astropy_helpers.sphinx.ext.automodapi
+.. automodapi:: sphinx_automodapi.automodapi
     :no-main-docstr:
 
 This comes after
@@ -204,15 +204,15 @@ def test_am_replacer_titleandhdrs():
 am_replacer_nomain_expected = """
 This comes before
 
-astropy_helpers.sphinx.ext.automodapi Module
+sphinx_automodapi.automodapi Module
 --------------------------------------------
 
 
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy_helpers.sphinx.ext.automodapi
+.. automodsumm:: sphinx_automodapi.automodapi
     :functions-only:
     :toctree: api/
 
@@ -236,7 +236,7 @@ def test_am_replacer_nomain():
 am_replacer_skip_str = """
 This comes before
 
-.. automodapi:: astropy_helpers.sphinx.ext.automodapi
+.. automodapi:: sphinx_automodapi.automodapi
     :skip: something1
     :skip: something2
 
@@ -246,15 +246,15 @@ def test_am_replacer_nomain():
 am_replacer_skip_expected = """
 This comes before
 
-astropy_helpers.sphinx.ext.automodapi Module
+sphinx_automodapi.automodapi Module
 --------------------------------------------
 
-.. automodule:: astropy_helpers.sphinx.ext.automodapi
+.. automodule:: sphinx_automodapi.automodapi
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy_helpers.sphinx.ext.automodapi
+.. automodsumm:: sphinx_automodapi.automodapi
     :functions-only:
     :toctree: api/
     :skip: something1,something2
@@ -279,7 +279,7 @@ def test_am_replacer_skip():
 am_replacer_invalidop_str = """
 This comes before
 
-.. automodapi:: astropy_helpers.sphinx.ext.automodapi
+.. automodapi:: sphinx_automodapi.automodapi
     :invalid-option:
 
 This comes after
diff --git a/sphinx_automodapi/tests/test_automodsumm.py b/sphinx_automodapi/tests/test_automodsumm.py
@@ -37,7 +37,7 @@ def __init__(self, srcdir, automodapipresent=True):
         self.warnings = []
         self._extensions = []
         if automodapipresent:
-            self._extensions.append('astropy_helpers.sphinx.ext.automodapi')
+            self._extensions.append('sphinx_automodapi.automodapi')
 
     def info(self, msg, loc):
         self.info.append((msg, loc))
@@ -49,14 +49,14 @@ def warn(self, msg, loc):
 ams_to_asmry_str = """
 Before
 
-.. automodsumm:: astropy_helpers.sphinx.ext.automodsumm
+.. automodsumm:: sphinx_automodapi.automodsumm
     :p:
 
 And After
 """
 
 ams_to_asmry_expected = """\
-.. currentmodule:: astropy_helpers.sphinx.ext.automodsumm
+.. currentmodule:: sphinx_automodapi.automodsumm
 
 .. autosummary::
     :p:
diff --git a/sphinx_automodapi/tests/test_utils.py b/sphinx_automodapi/tests/test_utils.py
@@ -20,12 +20,12 @@ def test_find_mod_objs():
     assert lnms == []
 
     lnms, fqns, objs = find_mod_objs(
-        'astropy_helpers.sphinx.ext.tests.test_utils', onlylocals=False)
+        'sphinx_automodapi.tests.test_utils', onlylocals=False)
 
     assert namedtuple in objs
 
     lnms, fqns, objs = find_mod_objs(
-        'astropy_helpers.sphinx.ext.tests.test_utils', onlylocals=True)
+        'sphinx_automodapi.tests.test_utils', onlylocals=True)
     assert 'namedtuple' not in lnms
     assert 'collections.namedtuple' not in fqns
     assert namedtuple not in objs
