updates the location of common macros for ads and non-ads templates

Author: chalmerlowe

gapic/ads-templates/docs/conf.py.j2

@@ -1,6 +1,7 @@
 {% extends '_base.py.j2' %}
 
 {% block content %}
+{% from "docs/common_setup.py.j2" import sphinx_imports, sphinx_setup %}
 
 #
 # {{ api.naming.warehouse_package_name }} documentation build configuration file
@@ -18,6 +19,7 @@ import logging
 import os
 import shlex
 import sys
+{{ sphinx_imports() }}
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -363,20 +365,6 @@ napoleon_use_ivar = False
 napoleon_use_param = True
 napoleon_use_rtype = True
 
-# --- Specific warning filters not covered by suppress_warnings ---
-
-class UnexpectedUnindentFilter(logging.Filter):
-    """Filter out warnings about unexpected unindentation following bullet lists."""
-    def filter(self, record):
-        # Return False to suppress the warning, True to allow it
-        msg = record.getMessage()
-        if "Bullet list ends without a blank line" in msg:
-            return False
-        return True
-
-def setup(app):
-    # Sphinx's logger is hierarchical. Adding a filter to the
-    # root 'sphinx' logger will catch warnings from all sub-loggers.
-    logger = logging.getLogger('sphinx')
-    logger.addFilter(UnexpectedUnindentFilter())
+# Setup for sphinx behaviors such as warning filters.
+{{ sphinx_setup() }}
 {% endblock %}

gapic/templates/docs/common_setup.py.j2

@@ -1,7 +1,7 @@
 {% extends '_base.py.j2' %}
 
 {% block content %}
-
+{% from "docs/common_setup.py.j2" import sphinx_imports, sphinx_setup %}
 #
 # {{ api.naming.warehouse_package_name }} documentation build configuration file
 #
@@ -18,6 +18,7 @@ import logging
 import os
 import shlex
 import sys
+{{ sphinx_imports() }}
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -374,20 +375,5 @@ napoleon_use_ivar = False
 napoleon_use_param = True
 napoleon_use_rtype = True
 
-# --- Specific warning filters not covered by suppress_warnings ---
-
-class UnexpectedUnindentFilter(logging.Filter):
-    """Filter out warnings about unexpected unindentation following bullet lists."""
-    def filter(self, record):
-        # Return False to suppress the warning, True to allow it
-        msg = record.getMessage()
-        if "Bullet list ends without a blank line" in msg:
-            return False
-        return True
-
-def setup(app):
-    # Sphinx's logger is hierarchical. Adding a filter to the
-    # root 'sphinx' logger will catch warnings from all sub-loggers.
-    logger = logging.getLogger('sphinx')
-    logger.addFilter(UnexpectedUnindentFilter())
+{{ sphinx_setup() }}
 {% endblock %}