Merge branch 'master' into fix-templates

Author: markmcd

Diff for: MANIFEST.in

@@ -1,2 +1,2 @@
 global-include **/templates/*
-global-include *.sh
+global-include *.sh

Diff for: tools/tensorflow_docs/api_generator/__init__.py

@@ -19,7 +19,6 @@
 from tensorflow_docs.api_generator import doc_generator_visitor
 from tensorflow_docs.api_generator import generate_lib
 from tensorflow_docs.api_generator import parser
-from tensorflow_docs.api_generator import pretty_docs
 from tensorflow_docs.api_generator import public_api
 from tensorflow_docs.api_generator import traverse
 from tensorflow_docs.api_generator import utils

Diff for: tools/tensorflow_docs/api_generator/generate_lib.py

@@ -29,10 +29,14 @@
 from tensorflow_docs.api_generator import doc_controls
 from tensorflow_docs.api_generator import doc_generator_visitor
 from tensorflow_docs.api_generator import parser
-from tensorflow_docs.api_generator import pretty_docs
 from tensorflow_docs.api_generator import public_api
+from tensorflow_docs.api_generator import reference_resolver as reference_resolver_lib
 from tensorflow_docs.api_generator import signature
 from tensorflow_docs.api_generator import traverse
+from tensorflow_docs.api_generator.pretty_docs import base_page
+
+from tensorflow_docs.api_generator.pretty_docs import docs_for_object
+
 from tensorflow_docs.api_generator.report import utils
 
 import yaml
@@ -433,7 +437,8 @@ def generate(self) -> Dict[str, Any]:
     return {'toc': toc}
 
 
-def _get_headers(page_info: parser.PageInfo, search_hints: bool) -> List[str]:
+def _get_headers(page_info: base_page.PageInfo,
+                 search_hints: bool) -> List[str]:
   """Returns the list of header lines for this page."""
   hidden = doc_controls.should_hide_from_search(page_info.py_object)
   brief_no_backticks = page_info.doc.brief.replace('`', '').strip()
@@ -558,8 +563,8 @@ def write_docs(
 
     # Generate docs for `py_object`, resolving references.
     try:
-      page_info = parser.docs_for_object(full_name, py_object, parser_config,
-                                         extra_docs)
+      page_info = docs_for_object.docs_for_object(full_name, py_object,
+                                                  parser_config, extra_docs)
       if gen_report and not full_name.startswith(
           ('tf.compat.v', 'tf.keras.backend', 'tf.numpy',
            'tf.experimental.numpy')):
@@ -571,7 +576,7 @@ def write_docs(
     path = output_dir / parser.documentation_path(full_name)
 
     content = _get_headers(page_info, search_hints)
-    content.append(pretty_docs.build_md_page(page_info))
+    content.append(page_info.build())
     text = '\n'.join(content)
     try:
       path.parent.mkdir(exist_ok=True, parents=True)
@@ -804,7 +809,7 @@ def __init__(
     self._extra_docs = extra_docs
 
   def make_reference_resolver(self, visitor):
-    return parser.ReferenceResolver.from_visitor(
+    return reference_resolver_lib.ReferenceResolver.from_visitor(
         visitor, py_module_names=[self._short_name])
 
   def make_parser_config(self, visitor, reference_resolver):
@@ -870,11 +875,7 @@ def build(self, output_dir):
           str(work_py_dir / self._short_name.replace('.', '/') /
               '_api_cache.json'))
 
-    try:
-      os.makedirs(output_dir)
-    except OSError as e:
-      if e.strerror != 'File exists':
-        raise
+    os.makedirs(output_dir, exist_ok=True)
 
     # Typical results are something like:
     #

Diff for: tools/tensorflow_docs/api_generator/generate_lib_test.py

@@ -28,6 +28,8 @@
 from tensorflow_docs.api_generator import doc_controls
 from tensorflow_docs.api_generator import generate_lib
 from tensorflow_docs.api_generator import parser
+from tensorflow_docs.api_generator import reference_resolver as reference_resolver_lib
+from tensorflow_docs.api_generator.pretty_docs import function_page
 
 import yaml
 
@@ -115,7 +117,7 @@ def get_test_objects(self):
 
     visitor = DummyVisitor(index, duplicate_of)
 
-    reference_resolver = parser.ReferenceResolver.from_visitor(
+    reference_resolver = reference_resolver_lib.ReferenceResolver.from_visitor(
         visitor=visitor, py_module_names=['tf'], link_prefix='api_docs/python')
 
     parser_config = config.ParserConfig(
@@ -186,9 +188,9 @@ def test_write(self):
     self.assertTrue((output_dir / 'tf/TestModule/test_function.md').exists())
 
   def _get_test_page_info(self):
-    page_info = parser.FunctionPageInfo(
+    page_info = function_page.FunctionPageInfo(
         full_name='abc', py_object=test_function)
-    docstring_info = parser._DocstringInfo(
+    docstring_info = parser.DocstringInfo(
         brief='hello `tensorflow`',
         docstring_parts=['line1', 'line2'],
         compatibility={})