Include manual Sql types in docs

plamut · plamut · commit 61e3a3401a0f · 2021-08-20T16:14:30.000+02:00
diff --git a/docs/bigquery/types.rst b/docs/bigquery/types.rst
@@ -1,7 +1,7 @@
 Types for Google Cloud Bigquery v2 API
 ======================================
 
-.. automodule:: google.cloud.bigquery_v2.types
+.. automodule:: google.cloud.bigquery.types
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/conf.py b/docs/conf.py
@@ -114,7 +114,6 @@
     "samples/AUTHORING_GUIDE.md",
     "samples/CONTRIBUTING.md",
     "samples/snippets/README.rst",
-    "bigquery_v2/services.rst",  # generated by the code generator
 ]
 
 # The reST default role (used for this markup: `text`) to use for all
diff --git a/docs/reference.rst b/docs/reference.rst
@@ -197,9 +197,9 @@ Encryption Configuration
 Additional Types
 ================
 
-Protocol buffer classes for working with the Models API.
+Helper SQL type classes.
 
 .. toctree::
     :maxdepth: 2
 
-    bigquery_v2/types
+    bigquery/types
diff --git a/owlbot.py b/owlbot.py
@@ -63,7 +63,7 @@
     s.replace(
         library / f"google/cloud/bigquery_{library.name}/types/standard_sql.py",
         r"type_ ",
-        "type "
+        "type ",
     )
 
     s.move(
@@ -78,8 +78,8 @@
             "noxfile.py",
             "setup.py",
             f"scripts/fixup_bigquery_{library.name}_keywords.py",
-            f"google/cloud/bigquery/__init__.py",
-            f"google/cloud/bigquery/py.typed",
+            "google/cloud/bigquery/__init__.py",
+            "google/cloud/bigquery/py.typed",
             # There are no public API endpoints for the generated ModelServiceClient,
             # thus there's no point in generating it and its tests.
             f"google/cloud/bigquery_{library.name}/services/**",
@@ -93,10 +93,7 @@
 # Add templated files
 # ----------------------------------------------------------------------------
 templated_files = common.py_library(
-    cov_level=100,
-    samples=True,
-    microgenerator=True,
-    split_system_tests=True,
+    cov_level=100, samples=True, microgenerator=True, split_system_tests=True,
 )
 
 # BigQuery has a custom multiprocessing note
@@ -109,7 +106,7 @@
         # Include custom SNIPPETS_TESTS job for performance.
         # https://github.com/googleapis/python-bigquery/issues/191
         ".kokoro/presubmit/presubmit.cfg",
-    ]
+    ],
 )
 
 # ----------------------------------------------------------------------------
@@ -121,42 +118,36 @@
 s.replace(
     "docs/conf.py",
     r'\{"members": True\}',
-    '{"members": True, "inherited-members": True}'
-)
-
-# Tell Sphinx to ingore autogenerated docs files.
-s.replace(
-    "docs/conf.py",
-    r'"samples/snippets/README\.rst",',
-    '\g<0>\n    "bigquery_v2/services.rst",  # generated by the code generator',
+    '{"members": True, "inherited-members": True}',
 )
 
 # ----------------------------------------------------------------------------
 # pytype-related changes
 # ----------------------------------------------------------------------------
 
 # Add .pytype to .gitignore
-s.replace(".gitignore", r"\.pytest_cache", "\g<0>\n.pytype")
+s.replace(".gitignore", r"\.pytest_cache", "\\g<0>\n.pytype")
 
 # Add pytype config to setup.cfg
 s.replace(
     "setup.cfg",
     r"universal = 1",
-    textwrap.dedent("""    \g<0>
+    textwrap.dedent(
+        """    \\g<0>
 
     [pytype]
     python_version = 3.8
     inputs =
         google/cloud/
     exclude =
         tests/
-        google/cloud/bigquery_v2/
     output = .pytype/
     disable =
         # There's some issue with finding some pyi files, thus disabling.
         # The issue https://github.com/google/pytype/issues/150 is closed, but the
         # error still occurs for some reason.
-        pyi-error""")
+        pyi-error"""
+    ),
 )
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@`
`114`	`114`	`"samples/AUTHORING_GUIDE.md",`
`115`	`115`	`"samples/CONTRIBUTING.md",`
`116`	`116`	`"samples/snippets/README.rst",`
`117`		`- "bigquery_v2/services.rst", # generated by the code generator`
`118`	`117`	`]`
`119`	`118`
`120`	`119`	# The reST default role (used for this markup: `text`) to use for all