Fix more paths

astropy · Jan 13, 2014 · 010ea7e · 010ea7e
1 parent 7026b05
commit 010ea7e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/astropy_helpers/sphinx/ext/automodapi.py b/astropy_helpers/sphinx/ext/automodapi.py
@@ -268,7 +268,7 @@ def process_automodapi(app, docname, source):
 
 def setup(app):
     # need automodsumm for automodapi
-    app.setup_extension('astropy.sphinx.ext.automodsumm')
+    app.setup_extension('astropy_helpers.sphinx.ext.automodsumm')
 
     app.connect('source-read', process_automodapi)
 

diff --git a/astropy_helpers/sphinx/ext/automodsumm.py b/astropy_helpers/sphinx/ext/automodsumm.py
@@ -227,8 +227,8 @@ def automodsumm_to_autosummary_lines(fn, app):
     fullfn = os.path.join(app.builder.env.srcdir, fn)
 
     with open(fullfn) as fr:
-        if 'astropy.sphinx.ext.automodapi' in app._extensions:
-            from astropy.sphinx.ext.automodapi import automodapi_replace
+        if 'astropy_helpers.sphinx.ext.automodapi' in app._extensions:
+            from astropy_helpers.sphinx.ext.automodapi import automodapi_replace
             # Must do the automodapi on the source to get the automodsumm
             # that might be in there
             filestr = automodapi_replace(fr.read(), app, True, fn, False)
@@ -506,7 +506,7 @@ def get_members_class(obj, typ, include_public=[],
 
 def setup(app):
     # need our autosummary
-    app.setup_extension('astropy.sphinx.ext.astropyautosummary')
+    app.setup_extension('astropy_helpers.sphinx.ext.astropyautosummary')
     # need inheritance-diagram for automod-diagram
     app.setup_extension('sphinx.ext.inheritance_diagram')
 

diff --git a/astropy_helpers/sphinx/ext/tests/test_automodapi.py b/astropy_helpers/sphinx/ext/tests/test_automodapi.py
@@ -34,7 +34,7 @@ def warn(self, msg, loc):
 am_replacer_str = """
 This comes before
 
-.. automodapi:: astropy.sphinx.ext.tests.test_automodapi
+.. automodapi:: astropy_helpers.sphinx.ext.tests.test_automodapi
 {options}
 
 This comes after
@@ -43,31 +43,31 @@ def warn(self, msg, loc):
 am_replacer_basic_expected = """
 This comes before
 
-astropy.sphinx.ext.tests.test_automodapi Module
+astropy_helpers.sphinx.ext.tests.test_automodapi Module
 -----------------------------------------------
 
-.. automodule:: astropy.sphinx.ext.tests.test_automodapi
+.. automodule:: astropy_helpers.sphinx.ext.tests.test_automodapi
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy.sphinx.ext.tests.test_automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :functions-only:
     :toctree: api/
     {empty}
 
 Classes
 ^^^^^^^
 
-.. automodsumm:: astropy.sphinx.ext.tests.test_automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :classes-only:
     :toctree: api/
     {empty}
 
 Class Inheritance Diagram
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. automod-diagram:: astropy.sphinx.ext.tests.test_automodapi
+.. automod-diagram:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :private-bases:
 
 This comes after
@@ -90,23 +90,23 @@ def test_am_replacer_basic():
 am_replacer_noinh_expected = """
 This comes before
 
-astropy.sphinx.ext.tests.test_automodapi Module
+astropy_helpers.sphinx.ext.tests.test_automodapi Module
 -----------------------------------------------
 
-.. automodule:: astropy.sphinx.ext.tests.test_automodapi
+.. automodule:: astropy_helpers.sphinx.ext.tests.test_automodapi
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy.sphinx.ext.tests.test_automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :functions-only:
     :toctree: api/
     {empty}
 
 Classes
 ^^^^^^^
 
-.. automodsumm:: astropy.sphinx.ext.tests.test_automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :classes-only:
     :toctree: api/
     {empty}
@@ -133,31 +133,31 @@ def test_am_replacer_noinh():
 am_replacer_titleandhdrs_expected = """
 This comes before
 
-astropy.sphinx.ext.tests.test_automodapi Module
+astropy_helpers.sphinx.ext.tests.test_automodapi Module
 &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
 
-.. automodule:: astropy.sphinx.ext.tests.test_automodapi
+.. automodule:: astropy_helpers.sphinx.ext.tests.test_automodapi
 
 Functions
 *********
 
-.. automodsumm:: astropy.sphinx.ext.tests.test_automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :functions-only:
     :toctree: api/
     {empty}
 
 Classes
 *******
 
-.. automodsumm:: astropy.sphinx.ext.tests.test_automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :classes-only:
     :toctree: api/
     {empty}
 
 Class Inheritance Diagram
 *************************
 
-.. automod-diagram:: astropy.sphinx.ext.tests.test_automodapi
+.. automod-diagram:: astropy_helpers.sphinx.ext.tests.test_automodapi
     :private-bases:
 
 
@@ -183,7 +183,7 @@ def test_am_replacer_titleandhdrs():
 am_replacer_nomain_str = """
 This comes before
 
-.. automodapi:: astropy.sphinx.ext.automodapi
+.. automodapi:: astropy_helpers.sphinx.ext.automodapi
     :no-main-docstr:
 
 This comes after
@@ -192,15 +192,15 @@ def test_am_replacer_titleandhdrs():
 am_replacer_nomain_expected = """
 This comes before
 
-astropy.sphinx.ext.automodapi Module
+astropy_helpers.sphinx.ext.automodapi Module
 ------------------------------------
 
 
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy.sphinx.ext.automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.automodapi
     :functions-only:
     :toctree: api/
     {empty}
@@ -225,7 +225,7 @@ def test_am_replacer_nomain():
 am_replacer_skip_str = """
 This comes before
 
-.. automodapi:: astropy.sphinx.ext.automodapi
+.. automodapi:: astropy_helpers.sphinx.ext.automodapi
     :skip: something1
     :skip: something2
 
@@ -235,15 +235,15 @@ def test_am_replacer_nomain():
 am_replacer_skip_expected = """
 This comes before
 
-astropy.sphinx.ext.automodapi Module
+astropy_helpers.sphinx.ext.automodapi Module
 ------------------------------------
 
-.. automodule:: astropy.sphinx.ext.automodapi
+.. automodule:: astropy_helpers.sphinx.ext.automodapi
 
 Functions
 ^^^^^^^^^
 
-.. automodsumm:: astropy.sphinx.ext.automodapi
+.. automodsumm:: astropy_helpers.sphinx.ext.automodapi
     :functions-only:
     :toctree: api/
     :skip: something1,something2
@@ -268,7 +268,7 @@ def test_am_replacer_skip():
 am_replacer_invalidop_str = """
 This comes before
 
-.. automodapi:: astropy.sphinx.ext.automodapi
+.. automodapi:: astropy_helpers.sphinx.ext.automodapi
     :invalid-option:
 
 This comes after

diff --git a/astropy_helpers/sphinx/ext/tests/test_automodsumm.py b/astropy_helpers/sphinx/ext/tests/test_automodsumm.py
@@ -30,7 +30,7 @@ def __init__(self, srcdir, automodapipresent=True):
         self.warnings = []
         self._extensions = []
         if automodapipresent:
-            self._extensions.append('astropy.sphinx.ext.automodapi')
+            self._extensions.append('astropy_helpers.sphinx.ext.automodapi')
 
     def info(self, msg, loc):
         self.info.append((msg, loc))
@@ -42,7 +42,7 @@ def warn(self, msg, loc):
 ams_to_asmry_str = """
 Before
 
-.. automodsumm:: astropy.sphinx.ext.automodsumm
+.. automodsumm:: astropy_helpers.sphinx.ext.automodsumm
     :p:
 
 And After
@@ -51,12 +51,12 @@ def warn(self, msg, loc):
 ams_to_asmry_expected = """.. autosummary::
     :p:
 
-    ~astropy.sphinx.ext.automodsumm.Automoddiagram
-    ~astropy.sphinx.ext.automodsumm.Automodsumm
-    ~astropy.sphinx.ext.automodsumm.automodsumm_to_autosummary_lines
-    ~astropy.sphinx.ext.automodsumm.generate_automodsumm_docs
-    ~astropy.sphinx.ext.automodsumm.process_automodsumm_generation
-    ~astropy.sphinx.ext.automodsumm.setup"""
+    ~astropy_helpers.sphinx.ext.automodsumm.Automoddiagram
+    ~astropy_helpers.sphinx.ext.automodsumm.Automodsumm
+    ~astropy_helpers.sphinx.ext.automodsumm.automodsumm_to_autosummary_lines
+    ~astropy_helpers.sphinx.ext.automodsumm.generate_automodsumm_docs
+    ~astropy_helpers.sphinx.ext.automodsumm.process_automodsumm_generation
+    ~astropy_helpers.sphinx.ext.automodsumm.setup"""
 
 
 def test_ams_to_asmry(tmpdir):