Merge branch 'public-master' into nl

Author: Luke Sneeringer

bigquery/google/cloud/bigquery/table.py

@@ -793,10 +793,18 @@ def insert_data(self,
                         passed, no de-duplication occurs.
 
         :type skip_invalid_rows: bool
-        :param skip_invalid_rows: (Optional) skip rows w/ invalid data?
+        :param skip_invalid_rows: (Optional)  Insert all valid rows of a
+                                  request, even if invalid rows exist.
+                                  The default value is False, which causes
+                                  the entire request to fail if any invalid
+                                  rows exist.
 
         :type ignore_unknown_values: bool
-        :param ignore_unknown_values: (Optional) ignore columns beyond schema?
+        :param ignore_unknown_values: (Optional) Accept rows that contain
+                                      values that do not match the schema.
+                                      The unknown values are ignored. Default
+                                      is False, which treats unknown values as
+                                      errors.
 
         :type template_suffix: str
         :param template_suffix:

vision/.coveragerc

@@ -1,5 +1,8 @@
 [run]
 branch = True
+omit =
+  google/cloud/vision_v1/gapic/*.py
+  google/cloud/vision_v1/proto/*.py
 
 [report]
 fail_under = 100

vision/google/cloud/gapic/__init__.py

@@ -34,7 +34,10 @@
 __version__ = get_distribution('google-cloud-vision').version
 
 from google.cloud.vision.client import Client
-from google.cloud.vision_v1 import *  # noqa
+
+from google.cloud.vision_v1 import enums
+from google.cloud.vision_v1 import ImageAnnotatorClient
+from google.cloud.vision_v1 import types
 
 
 __all__ = (

vision/google/cloud/gapic/vision/__init__.py

@@ -14,8 +14,8 @@
 
 """GAX Client for interacting with the Google Cloud Vision API."""
 
-from google.cloud.gapic.vision.v1 import image_annotator_client
-from google.cloud.proto.vision.v1 import image_annotator_pb2
+from google.cloud.vision_v1.gapic import image_annotator_client
+from google.cloud.vision_v1.proto import image_annotator_pb2
 
 from google.cloud.vision import __version__
 from google.cloud.vision.annotations import Annotations
@@ -43,7 +43,7 @@ def annotate(self, images=None, requests_pb=None):
                        e.g. [(image, [feature_one, feature_two]),]
 
         :type requests_pb: list
-        :param requests_pb: List of :class:`google.cloud.proto.vision.v1.\
+        :param requests_pb: List of :class:`google.cloud.vision_v1.proto.\
                             image_annotator_pb2.AnnotateImageRequest`
 
         :rtype: list
@@ -77,7 +77,7 @@ def _to_gapic_feature(feature):
     :param feature: Local ``Feature`` class to be converted to gRPC ``Feature``
                     instance.
 
-    :rtype: :class:`~google.cloud.proto.vision.v1.image_annotator_pb2.Feature`
+    :rtype: :class:`~google.cloud.vision_v1.proto.image_annotator_pb2.Feature`
     :returns: gRPC ``Feature`` converted from
               :class:`~google.cloud.vision.feature.Feature`.
     """
@@ -92,7 +92,7 @@ def _to_gapic_image(image):
     :type image: :class:`~google.cloud.vision.image.Image`
     :param image: Local ``Image`` class to be converted to gRPC ``Image``.
 
-    :rtype: :class:`~google.cloud.proto.vision.v1.image_annotator_pb2.Image`
+    :rtype: :class:`~google.cloud.vision_v1.proto.image_annotator_pb2.Image`
     :returns: gRPC ``Image`` converted from
               :class:`~google.cloud.vision.image.Image`.
     """