From b674615874d7ecbca456398c01673e129a3f294f Mon Sep 17 00:00:00 2001 From: Gus Class Date: Fri, 5 May 2017 10:58:17 -0700 Subject: [PATCH 01/47] Adds tutorials using Cloud Client [(#930)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/930) * Adds tutorials. * Removes unused enumerate --- samples/shotchange/README.md | 29 ++++++++++ samples/shotchange/requirements.txt | 1 + samples/shotchange/shotchange.py | 76 +++++++++++++++++++++++++++ samples/shotchange/shotchange_test.py | 32 +++++++++++ 4 files changed, 138 insertions(+) create mode 100644 samples/shotchange/README.md create mode 100644 samples/shotchange/requirements.txt create mode 100644 samples/shotchange/shotchange.py create mode 100644 samples/shotchange/shotchange_test.py diff --git a/samples/shotchange/README.md b/samples/shotchange/README.md new file mode 100644 index 00000000..1b510a0f --- /dev/null +++ b/samples/shotchange/README.md @@ -0,0 +1,29 @@ +# Google Cloud Video Intelligence + +Demonstrates label detection using the Google Cloud Video Intelligence API. + +## Setup +Please follow the [Set Up Your Project](https://cloud.google.com/video-intelligence/docs/getting-started#set_up_your_project) +steps in the Quickstart doc to create a project and enable the Google Cloud +Video Intelligence API. Following those steps, make sure that you +[Set Up a Service Account](https://cloud.google.com/video-intelligence/docs/common/auth#set_up_a_service_account), +and export the following environment variable: + +``` +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/your-project-credentials.json +``` + +## Run the sample + +Install [pip](https://pip.pypa.io/en/stable/installing) if not already installed. + +Install the necessary libraries using pip: + +```sh +$ pip install -r requirements.txt +``` + +Run the sample, for example: +``` +python shotchange.py gs://cloudmleap/video/googlework.mp4 +``` diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt new file mode 100644 index 00000000..ba92ac97 --- /dev/null +++ b/samples/shotchange/requirements.txt @@ -0,0 +1 @@ +https://storage.googleapis.com/videointelligence-alpha/videointelligence-python.zip diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py new file mode 100644 index 00000000..d6ecc88c --- /dev/null +++ b/samples/shotchange/shotchange.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python + +# Copyright 2017 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This application demonstrates how to perform basic operations with the +Google Cloud Video Intelligence API. + +For more information, check out the documentation at +https://cloud.google.com/videointelligence/docs. +""" + +# [START full_tutorial] +# [START imports] +import argparse +import sys +import time + +from google.cloud.gapic.videointelligence.v1beta1 import enums +from google.cloud.gapic.videointelligence.v1beta1 import ( + video_intelligence_service_client) +# [END imports] + + +def analyze_shots(path): + """ Detects camera shot changes. """ + # [START construct_request] + video_client = (video_intelligence_service_client. + VideoIntelligenceServiceClient()) + features = [enums.Feature.SHOT_CHANGE_DETECTION] + operation = video_client.annotate_video(path, features) + # [END construct_request] + print('\nProcessing video for shot change annotations:') + + # [START check_operation] + while not operation.done(): + sys.stdout.write('.') + sys.stdout.flush() + time.sleep(20) + + print('\nFinished processing.') + # [END check_operation] + + # [START parse_response] + shots = operation.result().annotation_results[0] + + for note, shot in enumerate(shots.shot_annotations): + print('Scene {}: {} to {}'.format( + note, + shot.start_time_offset, + shot.end_time_offset)) + # [END parse_response] + + +if __name__ == '__main__': + # [START running_app] + parser = argparse.ArgumentParser( + description=__doc__, + formatter_class=argparse.RawDescriptionHelpFormatter) + parser.add_argument('path', help='GCS file path for label detection.') + args = parser.parse_args() + + analyze_shots(args.path) + # [END running_app] +# [END full_tutorial] diff --git a/samples/shotchange/shotchange_test.py b/samples/shotchange/shotchange_test.py new file mode 100644 index 00000000..2c637036 --- /dev/null +++ b/samples/shotchange/shotchange_test.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python + +# Copyright 2017 Google, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os + +import pytest + +import shotchange + +BUCKET = os.environ['CLOUD_STORAGE_BUCKET'] +SHOTS_FILE_PATH = '/video/gbikes_dinosaur.mp4' + + +@pytest.mark.slow +def test_shots_dino(capsys): + shotchange.analyze_shots( + 'gs://{}{}'.format(BUCKET, SHOTS_FILE_PATH)) + out, _ = capsys.readouterr() + assert 'Scene 1:' in out From 8a5ce83316e3cd08e6e1fa98f2409f2f187cd888 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Fri, 5 May 2017 16:20:20 -0700 Subject: [PATCH 02/47] Adds one more tutorial as well as fixes some copy/paste typos. [(#933)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/933) --- samples/shotchange/README.md | 2 +- samples/shotchange/shotchange.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/shotchange/README.md b/samples/shotchange/README.md index 1b510a0f..4b338fa1 100644 --- a/samples/shotchange/README.md +++ b/samples/shotchange/README.md @@ -1,6 +1,6 @@ # Google Cloud Video Intelligence -Demonstrates label detection using the Google Cloud Video Intelligence API. +Demonstrates shot change detection using the Google Cloud Video Intelligence API. ## Setup Please follow the [Set Up Your Project](https://cloud.google.com/video-intelligence/docs/getting-started#set_up_your_project) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index d6ecc88c..a5ec6519 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -68,7 +68,7 @@ def analyze_shots(path): parser = argparse.ArgumentParser( description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('path', help='GCS file path for label detection.') + parser.add_argument('path', help='GCS path for shot change detection.') args = parser.parse_args() analyze_shots(args.path) From f044dd6d56a4cda6c78e148800d9e0970f6b67e0 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Thu, 18 May 2017 16:01:37 -0700 Subject: [PATCH 03/47] Adds new examples, replaces markdown with restructured text [(#945)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/945) * Adds new examples, replaces markdown with restructured text * Address review feedback * Use videos from pubilc bucket, update to new client library. * Style nit --- samples/shotchange/README.md | 29 -------- samples/shotchange/README.rst | 120 +++++++++++++++++++++++++++++++ samples/shotchange/README.rst.in | 20 ++++++ samples/shotchange/shotchange.py | 5 ++ 4 files changed, 145 insertions(+), 29 deletions(-) delete mode 100644 samples/shotchange/README.md create mode 100644 samples/shotchange/README.rst create mode 100644 samples/shotchange/README.rst.in diff --git a/samples/shotchange/README.md b/samples/shotchange/README.md deleted file mode 100644 index 4b338fa1..00000000 --- a/samples/shotchange/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# Google Cloud Video Intelligence - -Demonstrates shot change detection using the Google Cloud Video Intelligence API. - -## Setup -Please follow the [Set Up Your Project](https://cloud.google.com/video-intelligence/docs/getting-started#set_up_your_project) -steps in the Quickstart doc to create a project and enable the Google Cloud -Video Intelligence API. Following those steps, make sure that you -[Set Up a Service Account](https://cloud.google.com/video-intelligence/docs/common/auth#set_up_a_service_account), -and export the following environment variable: - -``` -export GOOGLE_APPLICATION_CREDENTIALS=/path/to/your-project-credentials.json -``` - -## Run the sample - -Install [pip](https://pip.pypa.io/en/stable/installing) if not already installed. - -Install the necessary libraries using pip: - -```sh -$ pip install -r requirements.txt -``` - -Run the sample, for example: -``` -python shotchange.py gs://cloudmleap/video/googlework.mp4 -``` diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst new file mode 100644 index 00000000..cf24f2f0 --- /dev/null +++ b/samples/shotchange/README.rst @@ -0,0 +1,120 @@ +.. This file is automatically generated. Do not edit this file directly. + +Google Cloud Video Intelligence API Python Samples +=============================================================================== + +This directory contains samples for Google Cloud Video Intelligence API. `Google Cloud Video Intelligence API`_ allows developers to easily integrate feature detection in video. + + + + +.. _Google Cloud Video Intelligence API: https://cloud.google.com/video-intelligence/docs + +Setup +------------------------------------------------------------------------------- + + +Authentication +++++++++++++++ + +Authentication is typically done through `Application Default Credentials`_, +which means you do not have to change the code to authenticate as long as +your environment has credentials. You have a few options for setting up +authentication: + +#. When running locally, use the `Google Cloud SDK`_ + + .. code-block:: bash + + gcloud auth application-default login + + +#. When running on App Engine or Compute Engine, credentials are already + set-up. However, you may need to configure your Compute Engine instance + with `additional scopes`_. + +#. You can create a `Service Account key file`_. This file can be used to + authenticate to Google Cloud Platform services from any environment. To use + the file, set the ``GOOGLE_APPLICATION_CREDENTIALS`` environment variable to + the path to the key file, for example: + + .. code-block:: bash + + export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service_account.json + +.. _Application Default Credentials: https://cloud.google.com/docs/authentication#getting_credentials_for_server-centric_flow +.. _additional scopes: https://cloud.google.com/compute/docs/authentication#using +.. _Service Account key file: https://developers.google.com/identity/protocols/OAuth2ServiceAccount#creatinganaccount + +Install Dependencies +++++++++++++++++++++ + +#. Install `pip`_ and `virtualenv`_ if you do not already have them. + +#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. + + .. code-block:: bash + + $ virtualenv env + $ source env/bin/activate + +#. Install the dependencies needed to run the samples. + + .. code-block:: bash + + $ pip install -r requirements.txt + +.. _pip: https://pip.pypa.io/ +.. _virtualenv: https://virtualenv.pypa.io/ + +Samples +------------------------------------------------------------------------------- + +Shot Change Detection ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + + +To run this sample: + +.. code-block:: bash + + $ python shotchange.py + + usage: shotchange.py [-h] path + + This application demonstrates how to perform basic operations with the + Google Cloud Video Intelligence API. + + For more information, check out the documentation at + https://cloud.google.com/videointelligence/docs. + + Example Usage: + + python shotchange.py gs://cloudmleap/video/googlework.mp4 + + positional arguments: + path GCS path for shot change detection. + + optional arguments: + -h, --help show this help message and exit + + + + +The client library +------------------------------------------------------------------------------- + +This sample uses the `Google Cloud Client Library for Python`_. +You can read the documentation for more details on API usage and use GitHub +to `browse the source`_ and `report issues`_. + +.. Google Cloud Client Library for Python: + https://googlecloudplatform.github.io/google-cloud-python/ +.. browse the source: + https://github.com/GoogleCloudPlatform/google-cloud-python +.. report issues: + https://github.com/GoogleCloudPlatform/google-cloud-python/issues + + +.. _Google Cloud SDK: https://cloud.google.com/sdk/ \ No newline at end of file diff --git a/samples/shotchange/README.rst.in b/samples/shotchange/README.rst.in new file mode 100644 index 00000000..9512ecdc --- /dev/null +++ b/samples/shotchange/README.rst.in @@ -0,0 +1,20 @@ +# This file is used to generate README.rst + +product: + name: Google Cloud Video Intelligence API + short_name: Cloud Video Intelligence API + url: https://cloud.google.com/video-intelligence/docs + description: > + `Google Cloud Video Intelligence API`_ allows developers to easily + integrate feature detection in video. + +setup: +- auth +- install_deps + +samples: +- name: Shot Change Detection + file: shotchange.py + show_help: True + +cloud_client_library: true diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index a5ec6519..c1894d51 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -19,6 +19,11 @@ For more information, check out the documentation at https://cloud.google.com/videointelligence/docs. + +Example Usage: + + python shotchange.py gs://cloudmleap/video/googlework.mp4 + """ # [START full_tutorial] From cabc26ac86ff4e73e97e29b40c36e199a7b56f6c Mon Sep 17 00:00:00 2001 From: Gus Class Date: Thu, 18 May 2017 16:44:27 -0700 Subject: [PATCH 04/47] Updates requirements [(#952)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/952) --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index ba92ac97..b2aa05b6 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -https://storage.googleapis.com/videointelligence-alpha/videointelligence-python.zip +google-cloud-videointelligence==0.25.0 From 4f9e8d6c71fca74fde4d0c40763ea5bea3097c7a Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Tue, 23 May 2017 17:01:25 -0700 Subject: [PATCH 05/47] Fix README rst links [(#962)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/962) * Fix README rst links * Update all READMEs --- samples/shotchange/README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index cf24f2f0..6b5f9790 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -109,11 +109,11 @@ This sample uses the `Google Cloud Client Library for Python`_. You can read the documentation for more details on API usage and use GitHub to `browse the source`_ and `report issues`_. -.. Google Cloud Client Library for Python: +.. _Google Cloud Client Library for Python: https://googlecloudplatform.github.io/google-cloud-python/ -.. browse the source: +.. _browse the source: https://github.com/GoogleCloudPlatform/google-cloud-python -.. report issues: +.. _report issues: https://github.com/GoogleCloudPlatform/google-cloud-python/issues From 384aec23a5c3da914a8d2756bcfef67f2a06713f Mon Sep 17 00:00:00 2001 From: florencep Date: Wed, 24 May 2017 09:21:23 -0700 Subject: [PATCH 06/47] change the usage file sample [(#958)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/958) since the file does not exist. Propose to use the same one as the tutorial: demomaker/gbikes_dinosaur.mp4 --- samples/shotchange/shotchange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index c1894d51..418b89fe 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -22,7 +22,7 @@ Example Usage: - python shotchange.py gs://cloudmleap/video/googlework.mp4 + python shotchange.py gs://demomaker/gbikes_dinosaur.mp4 """ From 77fdffaf97cd2f2c64c38b99eb831cc83bd6b482 Mon Sep 17 00:00:00 2001 From: Gus Class Date: Wed, 31 May 2017 13:07:01 -0700 Subject: [PATCH 07/47] Updates examples for video [(#968)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/968) --- samples/shotchange/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index 6b5f9790..c074c30e 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -91,7 +91,7 @@ To run this sample: Example Usage: - python shotchange.py gs://cloudmleap/video/googlework.mp4 + python shotchange.py gs://demomaker/gbikes_dinosaur.mp4 positional arguments: path GCS path for shot change detection. From 4e138c1e0f2cd81fb31bb9ddac48e1b0689e675b Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 29 Aug 2017 16:53:02 -0700 Subject: [PATCH 08/47] Auto-update dependencies. [(#1093)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1093) * Auto-update dependencies. * Fix storage notification poll sample Change-Id: I6afbc79d15e050531555e4c8e51066996717a0f3 * Fix spanner samples Change-Id: I40069222c60d57e8f3d3878167591af9130895cb * Drop coverage because it's not useful Change-Id: Iae399a7083d7866c3c7b9162d0de244fbff8b522 * Try again to fix flaky logging test Change-Id: I6225c074701970c17c426677ef1935bb6d7e36b4 --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index b2aa05b6..28c02728 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==0.25.0 +google-cloud-videointelligence==0.26.0 From 2697805bc73a501e5cae2275294cf719713632be Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Mon, 18 Sep 2017 11:04:05 -0700 Subject: [PATCH 09/47] Update all generated readme auth instructions [(#1121)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1121) Change-Id: I03b5eaef8b17ac3dc3c0339fd2c7447bd3e11bd2 --- samples/shotchange/README.rst | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index c074c30e..61b6a4dc 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -17,34 +17,12 @@ Setup Authentication ++++++++++++++ -Authentication is typically done through `Application Default Credentials`_, -which means you do not have to change the code to authenticate as long as -your environment has credentials. You have a few options for setting up -authentication: +This sample requires you to have authentication setup. Refer to the +`Authentication Getting Started Guide`_ for instructions on setting up +credentials for applications. -#. When running locally, use the `Google Cloud SDK`_ - - .. code-block:: bash - - gcloud auth application-default login - - -#. When running on App Engine or Compute Engine, credentials are already - set-up. However, you may need to configure your Compute Engine instance - with `additional scopes`_. - -#. You can create a `Service Account key file`_. This file can be used to - authenticate to Google Cloud Platform services from any environment. To use - the file, set the ``GOOGLE_APPLICATION_CREDENTIALS`` environment variable to - the path to the key file, for example: - - .. code-block:: bash - - export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service_account.json - -.. _Application Default Credentials: https://cloud.google.com/docs/authentication#getting_credentials_for_server-centric_flow -.. _additional scopes: https://cloud.google.com/compute/docs/authentication#using -.. _Service Account key file: https://developers.google.com/identity/protocols/OAuth2ServiceAccount#creatinganaccount +.. _Authentication Getting Started Guide: + https://cloud.google.com/docs/authentication/getting-started Install Dependencies ++++++++++++++++++++ From 96bb40f585e09ef27e04da2bab99a7a40442adcf Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 19 Sep 2017 09:34:15 -0700 Subject: [PATCH 10/47] Auto-update dependencies. [(#1123)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1123) --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 28c02728..d3b18758 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==0.26.0 +google-cloud-videointelligence==0.27.2 From 26b6337827c8a701fdb0a3f01ba75094c0d9a7f9 Mon Sep 17 00:00:00 2001 From: Yu-Han Liu Date: Tue, 19 Sep 2017 14:42:07 -0700 Subject: [PATCH 11/47] Video v1beta2 [(#1088)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1088) * update analyze_safe_search * update analyze_shots * update explicit_content_detection and test * update fece detection * update label detection (path) * update label detection (file) * flake * safe search --> explicit content * update faces tutorial * update client library quickstart * update shotchange tutorial * update labels tutorial * correct spelling * correction start_time_offset * import order * rebased --- samples/shotchange/shotchange.py | 23 +++++++++++------------ samples/shotchange/shotchange_test.py | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index 418b89fe..4db4ca3b 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -32,17 +32,15 @@ import sys import time -from google.cloud.gapic.videointelligence.v1beta1 import enums -from google.cloud.gapic.videointelligence.v1beta1 import ( - video_intelligence_service_client) +from google.cloud import videointelligence_v1beta2 +from google.cloud.videointelligence_v1beta2 import enums # [END imports] def analyze_shots(path): """ Detects camera shot changes. """ # [START construct_request] - video_client = (video_intelligence_service_client. - VideoIntelligenceServiceClient()) + video_client = videointelligence_v1beta2.VideoIntelligenceServiceClient() features = [enums.Feature.SHOT_CHANGE_DETECTION] operation = video_client.annotate_video(path, features) # [END construct_request] @@ -58,13 +56,14 @@ def analyze_shots(path): # [END check_operation] # [START parse_response] - shots = operation.result().annotation_results[0] - - for note, shot in enumerate(shots.shot_annotations): - print('Scene {}: {} to {}'.format( - note, - shot.start_time_offset, - shot.end_time_offset)) + shots = operation.result().annotation_results[0].shot_annotations + + for i, shot in enumerate(shots): + start_time = (shot.start_time_offset.seconds + + shot.start_time_offset.nanos / 1e9) + end_time = (shot.end_time_offset.seconds + + shot.end_time_offset.nanos / 1e9) + print('\tShot {}: {} to {}'.format(i, start_time, end_time)) # [END parse_response] diff --git a/samples/shotchange/shotchange_test.py b/samples/shotchange/shotchange_test.py index 2c637036..a004f56d 100644 --- a/samples/shotchange/shotchange_test.py +++ b/samples/shotchange/shotchange_test.py @@ -29,4 +29,4 @@ def test_shots_dino(capsys): shotchange.analyze_shots( 'gs://{}{}'.format(BUCKET, SHOTS_FILE_PATH)) out, _ = capsys.readouterr() - assert 'Scene 1:' in out + assert 'Shot 1:' in out From 6b0c420c3a26c6a858b6e80e426ed3941f4e1cf5 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Thu, 12 Oct 2017 10:16:11 -0700 Subject: [PATCH 12/47] Added Link to Python Setup Guide [(#1158)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1158) * Update Readme.rst to add Python setup guide As requested in b/64770713. This sample is linked in documentation https://cloud.google.com/bigtable/docs/scaling, and it would make more sense to update the guide here than in the documentation. * Update README.rst * Update README.rst * Update README.rst * Update README.rst * Update README.rst * Update install_deps.tmpl.rst * Updated readmegen scripts and re-generated related README files * Fixed the lint error --- samples/shotchange/README.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index 61b6a4dc..2a4de5e9 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -27,7 +27,10 @@ credentials for applications. Install Dependencies ++++++++++++++++++++ -#. Install `pip`_ and `virtualenv`_ if you do not already have them. +#. Install `pip`_ and `virtualenv`_ if you do not already have them. You may want to refer to the `Python Development Environment Setup Guide`_ for Google Cloud Platform for instructions. + + .. _Python Development Environment Setup Guide: + https://cloud.google.com/python/setup #. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. From aef3308fafbe9f2440e4bdb0ece40037b6385cfe Mon Sep 17 00:00:00 2001 From: Perry Stoll Date: Thu, 12 Oct 2017 13:16:50 -0400 Subject: [PATCH 13/47] Tweak doc/help strings for sample tools [(#1160)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1160) * Corrected copy-paste on doc string * Updated doc/help string to be more specific to labels tool * Made shotchange doc/help string more specific * Tweaked doc/help string to indicate no arg expected * Adjusted import order to satisfy flake8 * Wrapped doc string to 79 chars to flake8 correctly * Adjusted import order to pass flake8 test --- samples/shotchange/shotchange.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index 4db4ca3b..bd680084 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This application demonstrates how to perform basic operations with the -Google Cloud Video Intelligence API. +"""This application demonstrates how to identify all different shots +in a video using the Google Cloud Video Intelligence API. For more information, check out the documentation at https://cloud.google.com/videointelligence/docs. From 3acd5f5e4b36ff146b96a613702f5a12616e4ac3 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Wed, 1 Nov 2017 12:30:10 -0700 Subject: [PATCH 14/47] Auto-update dependencies. [(#1186)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1186) --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index d3b18758..481c80c4 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==0.27.2 +google-cloud-videointelligence==0.28.0 From df56ca2efb773dab9e85cbb996f4d8ae79266cd6 Mon Sep 17 00:00:00 2001 From: Yu-Han Liu Date: Wed, 29 Nov 2017 15:39:47 -0800 Subject: [PATCH 15/47] update samples to v1 [(#1221)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1221) * update samples to v1 * replace while loop with operation.result(timeout) * addressing review comments * flake * flake --- samples/shotchange/requirements.txt | 2 +- samples/shotchange/shotchange.py | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 481c80c4..747f3c7a 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==0.28.0 +google-cloud-videointelligence==1.0.0 diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index bd680084..286838ca 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -29,36 +29,27 @@ # [START full_tutorial] # [START imports] import argparse -import sys -import time -from google.cloud import videointelligence_v1beta2 -from google.cloud.videointelligence_v1beta2 import enums +from google.cloud import videointelligence # [END imports] def analyze_shots(path): """ Detects camera shot changes. """ # [START construct_request] - video_client = videointelligence_v1beta2.VideoIntelligenceServiceClient() - features = [enums.Feature.SHOT_CHANGE_DETECTION] - operation = video_client.annotate_video(path, features) + video_client = videointelligence.VideoIntelligenceServiceClient() + features = [videointelligence.enums.Feature.SHOT_CHANGE_DETECTION] + operation = video_client.annotate_video(path, features=features) # [END construct_request] print('\nProcessing video for shot change annotations:') # [START check_operation] - while not operation.done(): - sys.stdout.write('.') - sys.stdout.flush() - time.sleep(20) - + result = operation.result(timeout=90) print('\nFinished processing.') # [END check_operation] # [START parse_response] - shots = operation.result().annotation_results[0].shot_annotations - - for i, shot in enumerate(shots): + for i, shot in enumerate(result.annotation_results[0].shot_annotations): start_time = (shot.start_time_offset.seconds + shot.start_time_offset.nanos / 1e9) end_time = (shot.end_time_offset.seconds + From 5d379ef2a50450319112672cc69829bc4713c3a1 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Thu, 7 Dec 2017 10:34:29 -0800 Subject: [PATCH 16/47] Added "Open in Cloud Shell" buttons to README files [(#1254)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1254) --- samples/shotchange/README.rst | 25 +++++++++++++++++-------- samples/shotchange/README.rst.in | 2 ++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index 2a4de5e9..fd0041bc 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -3,6 +3,10 @@ Google Cloud Video Intelligence API Python Samples =============================================================================== +.. image:: https://gstatic.com/cloudssh/images/open-btn.png + :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=video/cloud-client/shotchange/README.rst + + This directory contains samples for Google Cloud Video Intelligence API. `Google Cloud Video Intelligence API`_ allows developers to easily integrate feature detection in video. @@ -54,6 +58,10 @@ Samples Shot Change Detection +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.. image:: https://gstatic.com/cloudssh/images/open-btn.png + :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=video/cloud-client/shotchange/shotchange.py;video/cloud-client/shotchange/README.rst + + To run this sample: @@ -63,26 +71,27 @@ To run this sample: $ python shotchange.py usage: shotchange.py [-h] path - - This application demonstrates how to perform basic operations with the - Google Cloud Video Intelligence API. - + + This application demonstrates how to identify all different shots + in a video using the Google Cloud Video Intelligence API. + For more information, check out the documentation at https://cloud.google.com/videointelligence/docs. - + Example Usage: - + python shotchange.py gs://demomaker/gbikes_dinosaur.mp4 - + positional arguments: path GCS path for shot change detection. - + optional arguments: -h, --help show this help message and exit + The client library ------------------------------------------------------------------------------- diff --git a/samples/shotchange/README.rst.in b/samples/shotchange/README.rst.in index 9512ecdc..6463d192 100644 --- a/samples/shotchange/README.rst.in +++ b/samples/shotchange/README.rst.in @@ -18,3 +18,5 @@ samples: show_help: True cloud_client_library: true + +folder: video/cloud-client/shotchange \ No newline at end of file From f4051425e0b752377bc600bbcd6d583c6749c867 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 5 Mar 2018 12:28:55 -0800 Subject: [PATCH 17/47] Auto-update dependencies. [(#1377)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1377) * Auto-update dependencies. * Update requirements.txt --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 747f3c7a..e2ad27b8 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.0.0 +google-cloud-videointelligence==1.0.1 From 3eadd145631ae8003cbbcf72bb99dd639d01ee72 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Mon, 2 Apr 2018 02:51:10 -0700 Subject: [PATCH 18/47] Auto-update dependencies. --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index e2ad27b8..bf3b2da4 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.0.1 +google-cloud-videointelligence==1.1.0 From 5686751abb04514b3b201f5843be3b8a34c9363b Mon Sep 17 00:00:00 2001 From: chenyumic Date: Fri, 6 Apr 2018 22:57:36 -0700 Subject: [PATCH 19/47] Regenerate the README files and fix the Open in Cloud Shell link for some samples [(#1441)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1441) --- samples/shotchange/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index fd0041bc..bd98d533 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -12,7 +12,7 @@ This directory contains samples for Google Cloud Video Intelligence API. `Google -.. _Google Cloud Video Intelligence API: https://cloud.google.com/video-intelligence/docs +.. _Google Cloud Video Intelligence API: https://cloud.google.com/video-intelligence/docs Setup ------------------------------------------------------------------------------- @@ -59,7 +59,7 @@ Shot Change Detection +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .. image:: https://gstatic.com/cloudssh/images/open-btn.png - :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=video/cloud-client/shotchange/shotchange.py;video/cloud-client/shotchange/README.rst + :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=video/cloud-client/shotchange/shotchange.py,video/cloud-client/shotchange/README.rst From 8f83644b80887319bcd56a68e467c07102472f31 Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Thu, 26 Apr 2018 10:26:41 -0700 Subject: [PATCH 20/47] Update READMEs to fix numbering and add git clone [(#1464)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1464) --- samples/shotchange/README.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index bd98d533..3d5bf2e7 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -31,10 +31,16 @@ credentials for applications. Install Dependencies ++++++++++++++++++++ +#. Clone python-docs-samples and change directory to the sample directory you want to use. + + .. code-block:: bash + + $ git clone https://github.com/GoogleCloudPlatform/python-docs-samples.git + #. Install `pip`_ and `virtualenv`_ if you do not already have them. You may want to refer to the `Python Development Environment Setup Guide`_ for Google Cloud Platform for instructions. - .. _Python Development Environment Setup Guide: - https://cloud.google.com/python/setup + .. _Python Development Environment Setup Guide: + https://cloud.google.com/python/setup #. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. From 4e944dd7db94979a121111adb0a683d55603be0e Mon Sep 17 00:00:00 2001 From: Alix Hamilton Date: Mon, 20 Aug 2018 12:26:42 -0700 Subject: [PATCH 21/47] Video Intelligence region tag update [(#1639)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1639) --- samples/shotchange/shotchange.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index 286838ca..e9b91dfd 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -26,40 +26,40 @@ """ -# [START full_tutorial] -# [START imports] +# [START video_shot_tutorial] +# [START video_shot_tutorial_imports] import argparse from google.cloud import videointelligence -# [END imports] +# [END video_shot_tutorial_imports] def analyze_shots(path): """ Detects camera shot changes. """ - # [START construct_request] + # [START video_shot_tutorial_construct_request] video_client = videointelligence.VideoIntelligenceServiceClient() features = [videointelligence.enums.Feature.SHOT_CHANGE_DETECTION] operation = video_client.annotate_video(path, features=features) - # [END construct_request] + # [END video_shot_tutorial_construct_request] print('\nProcessing video for shot change annotations:') - # [START check_operation] + # [START video_shot_tutorial_check_operation] result = operation.result(timeout=90) print('\nFinished processing.') - # [END check_operation] + # [END video_shot_tutorial_check_operation] - # [START parse_response] + # [START video_shot_tutorial_parse_response] for i, shot in enumerate(result.annotation_results[0].shot_annotations): start_time = (shot.start_time_offset.seconds + shot.start_time_offset.nanos / 1e9) end_time = (shot.end_time_offset.seconds + shot.end_time_offset.nanos / 1e9) print('\tShot {}: {} to {}'.format(i, start_time, end_time)) - # [END parse_response] + # [END video_shot_tutorial_parse_response] if __name__ == '__main__': - # [START running_app] + # [START video_shot_tutorial_run_application] parser = argparse.ArgumentParser( description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) @@ -67,5 +67,5 @@ def analyze_shots(path): args = parser.parse_args() analyze_shots(args.path) - # [END running_app] -# [END full_tutorial] + # [END video_shot_tutorial_run_application] +# [END video_shot_tutorial] From 9be4a769ed38620a5c54579a344632dac0ca1dea Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 28 Aug 2018 11:17:45 -0700 Subject: [PATCH 22/47] Auto-update dependencies. [(#1658)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1658) * Auto-update dependencies. * Rollback appengine/standard/bigquery/. * Rollback appengine/standard/iap/. * Rollback bigtable/metricscaler. * Rolledback appengine/flexible/datastore. * Rollback dataproc/ * Rollback jobs/api_client * Rollback vision/cloud-client. * Rollback functions/ocr/app. * Rollback iot/api-client/end_to_end_example. * Rollback storage/cloud-client. * Rollback kms/api-client. * Rollback dlp/ * Rollback bigquery/cloud-client. * Rollback iot/api-client/manager. * Rollback appengine/flexible/cloudsql_postgresql. --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index bf3b2da4..3e462bd8 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.1.0 +google-cloud-videointelligence==1.3.0 From 474bd6cf93e67748c6f87ec2a8a1b4c2b7658f67 Mon Sep 17 00:00:00 2001 From: Alix Hamilton Date: Wed, 10 Oct 2018 10:00:33 -0700 Subject: [PATCH 23/47] Use explicit URIs for Video Intelligence sample tests [(#1743)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1743) --- samples/shotchange/shotchange_test.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/samples/shotchange/shotchange_test.py b/samples/shotchange/shotchange_test.py index a004f56d..752e595c 100644 --- a/samples/shotchange/shotchange_test.py +++ b/samples/shotchange/shotchange_test.py @@ -14,19 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os - import pytest import shotchange -BUCKET = os.environ['CLOUD_STORAGE_BUCKET'] -SHOTS_FILE_PATH = '/video/gbikes_dinosaur.mp4' - @pytest.mark.slow def test_shots_dino(capsys): - shotchange.analyze_shots( - 'gs://{}{}'.format(BUCKET, SHOTS_FILE_PATH)) + shotchange.analyze_shots('gs://demomaker/gbikes_dinosaur.mp4') out, _ = capsys.readouterr() assert 'Shot 1:' in out From dea7bc7582dae100f2d8c735644e3be1515503d4 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 20 Nov 2018 15:40:29 -0800 Subject: [PATCH 24/47] Auto-update dependencies. [(#1846)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1846) ACK, merging. --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 3e462bd8..e678d25a 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.3.0 +google-cloud-videointelligence==1.6.0 From 5821ca25007c37daa92a465e5a857afa76177f0c Mon Sep 17 00:00:00 2001 From: Charles Engelke Date: Mon, 26 Nov 2018 13:08:29 -0800 Subject: [PATCH 25/47] Longer timeouts to address intermittent failures [(#1871)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1871) --- samples/shotchange/shotchange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index e9b91dfd..2db0e832 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -44,7 +44,7 @@ def analyze_shots(path): print('\nProcessing video for shot change annotations:') # [START video_shot_tutorial_check_operation] - result = operation.result(timeout=90) + result = operation.result(timeout=120) print('\nFinished processing.') # [END video_shot_tutorial_check_operation] From 932893c4910ad722429b29b73cd2bf9ac5714a79 Mon Sep 17 00:00:00 2001 From: DPEBot Date: Wed, 6 Feb 2019 12:06:35 -0800 Subject: [PATCH 26/47] Auto-update dependencies. [(#1980)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/1980) * Auto-update dependencies. * Update requirements.txt * Update requirements.txt --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index e678d25a..0a5c79b1 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.6.0 +google-cloud-videointelligence==1.6.1 From 83e80fe9663a65cde6ced6f19bf19d4a95df94c9 Mon Sep 17 00:00:00 2001 From: Yu-Han Liu Date: Thu, 16 May 2019 15:35:02 -0700 Subject: [PATCH 27/47] =?UTF-8?q?replace=20demomaker=20with=20cloud-sample?= =?UTF-8?q?s-data/video=20for=20video=20intelligenc=E2=80=A6=20[(#2162)](h?= =?UTF-8?q?ttps://github.com/GoogleCloudPlatform/python-docs-samples/issue?= =?UTF-8?q?s/2162)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * replace demomaker with cloud-samples-data/video for video intelligence samples * flake --- samples/shotchange/README.rst | 4 ++-- samples/shotchange/shotchange.py | 2 +- samples/shotchange/shotchange_test.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index 3d5bf2e7..f70472a3 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -86,7 +86,7 @@ To run this sample: Example Usage: - python shotchange.py gs://demomaker/gbikes_dinosaur.mp4 + python shotchange.py gs://cloud-samples-data/video/gbikes_dinosaur.mp4 positional arguments: path GCS path for shot change detection. @@ -113,4 +113,4 @@ to `browse the source`_ and `report issues`_. https://github.com/GoogleCloudPlatform/google-cloud-python/issues -.. _Google Cloud SDK: https://cloud.google.com/sdk/ \ No newline at end of file +.. _Google Cloud SDK: https://cloud.google.com/sdk/ diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index 2db0e832..81bdefba 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -22,7 +22,7 @@ Example Usage: - python shotchange.py gs://demomaker/gbikes_dinosaur.mp4 + python shotchange.py gs://cloud-samples-data/video/gbikes_dinosaur.mp4 """ diff --git a/samples/shotchange/shotchange_test.py b/samples/shotchange/shotchange_test.py index 752e595c..0722e0c6 100644 --- a/samples/shotchange/shotchange_test.py +++ b/samples/shotchange/shotchange_test.py @@ -21,6 +21,7 @@ @pytest.mark.slow def test_shots_dino(capsys): - shotchange.analyze_shots('gs://demomaker/gbikes_dinosaur.mp4') + shotchange.analyze_shots( + 'gs://cloud-samples-data/video/gbikes_dinosaur.mp4') out, _ = capsys.readouterr() assert 'Shot 1:' in out From 403e73a919cf217b946d39a1ff8c04f85d61772b Mon Sep 17 00:00:00 2001 From: Gus Class Date: Mon, 7 Oct 2019 15:45:22 -0700 Subject: [PATCH 28/47] Adds updates for samples profiler ... vision [(#2439)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2439) --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 0a5c79b1..aa6b5613 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.6.1 +google-cloud-videointelligence==1.11.0 From 908d4033b15755d6e8ce571ae54cad3920c9d7d9 Mon Sep 17 00:00:00 2001 From: DPEBot Date: Fri, 20 Dec 2019 17:41:38 -0800 Subject: [PATCH 29/47] Auto-update dependencies. [(#2005)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2005) * Auto-update dependencies. * Revert update of appengine/flexible/datastore. * revert update of appengine/flexible/scipy * revert update of bigquery/bqml * revert update of bigquery/cloud-client * revert update of bigquery/datalab-migration * revert update of bigtable/quickstart * revert update of compute/api * revert update of container_registry/container_analysis * revert update of dataflow/run_template * revert update of datastore/cloud-ndb * revert update of dialogflow/cloud-client * revert update of dlp * revert update of functions/imagemagick * revert update of functions/ocr/app * revert update of healthcare/api-client/fhir * revert update of iam/api-client * revert update of iot/api-client/gcs_file_to_device * revert update of iot/api-client/mqtt_example * revert update of language/automl * revert update of run/image-processing * revert update of vision/automl * revert update testing/requirements.txt * revert update of vision/cloud-client/detect * revert update of vision/cloud-client/product_search * revert update of jobs/v2/api_client * revert update of jobs/v3/api_client * revert update of opencensus * revert update of translate/cloud-client * revert update to speech/cloud-client Co-authored-by: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Co-authored-by: Doug Mahugh --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index aa6b5613..4e0b7df4 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.11.0 +google-cloud-videointelligence==1.12.1 From a4bb557dfbf3c2b52ab5099b05bd2c242510857b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 27 Mar 2020 17:19:58 +0100 Subject: [PATCH 30/47] chore(deps): update dependency google-cloud-videointelligence to v1.14.0 [(#3169)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/3169) --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 4e0b7df4..8b966916 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.12.1 +google-cloud-videointelligence==1.14.0 From 3c6b399f35e89fab20c50e72f5802033d5739ff0 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Wed, 1 Apr 2020 19:11:50 -0700 Subject: [PATCH 31/47] Simplify noxfile setup. [(#2806)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/2806) * chore(deps): update dependency requests to v2.23.0 * Simplify noxfile and add version control. * Configure appengine/standard to only test Python 2.7. * Update Kokokro configs to match noxfile. * Add requirements-test to each folder. * Remove Py2 versions from everything execept appengine/standard. * Remove conftest.py. * Remove appengine/standard/conftest.py * Remove 'no-sucess-flaky-report' from pytest.ini. * Add GAE SDK back to appengine/standard tests. * Fix typo. * Roll pytest to python 2 version. * Add a bunch of testing requirements. * Remove typo. * Add appengine lib directory back in. * Add some additional requirements. * Fix issue with flake8 args. * Even more requirements. * Readd appengine conftest.py. * Add a few more requirements. * Even more Appengine requirements. * Add webtest for appengine/standard/mailgun. * Add some additional requirements. * Add workaround for issue with mailjet-rest. * Add responses for appengine/standard/mailjet. Co-authored-by: Renovate Bot --- samples/shotchange/requirements-test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 samples/shotchange/requirements-test.txt diff --git a/samples/shotchange/requirements-test.txt b/samples/shotchange/requirements-test.txt new file mode 100644 index 00000000..781d4326 --- /dev/null +++ b/samples/shotchange/requirements-test.txt @@ -0,0 +1 @@ +pytest==5.3.2 From 2fba04c01add8908e96cffe308427c9918b251fb Mon Sep 17 00:00:00 2001 From: Eric Schmidt Date: Tue, 9 Jun 2020 11:40:08 -0700 Subject: [PATCH 32/47] fix: changes positional to named pararameters in Video samples [(#4017)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4017) Changes calls to `VideoClient.annotate_video()` so that GCS URIs are provided as named parameters. Example: ``` operation = video_client.annotate_video(path, features=features) ``` Becomes: ``` operation = video_client.annotate_video(input_uri=path, features=features) ``` --- samples/shotchange/shotchange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/shotchange.py b/samples/shotchange/shotchange.py index 81bdefba..40edf001 100644 --- a/samples/shotchange/shotchange.py +++ b/samples/shotchange/shotchange.py @@ -39,7 +39,7 @@ def analyze_shots(path): # [START video_shot_tutorial_construct_request] video_client = videointelligence.VideoIntelligenceServiceClient() features = [videointelligence.enums.Feature.SHOT_CHANGE_DETECTION] - operation = video_client.annotate_video(path, features=features) + operation = video_client.annotate_video(input_uri=path, features=features) # [END video_shot_tutorial_construct_request] print('\nProcessing video for shot change annotations:') From 2687328e1f003f8bca5a4cd912027a64248e9480 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 16 Jun 2020 17:20:10 +0200 Subject: [PATCH 33/47] Update dependency google-cloud-videointelligence to v1.15.0 [(#4041)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4041) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [google-cloud-videointelligence](https://togithub.com/googleapis/python-videointelligence) | minor | `==1.14.0` -> `==1.15.0` | --- ### Release Notes
googleapis/python-videointelligence ### [`v1.15.0`](https://togithub.com/googleapis/python-videointelligence/blob/master/CHANGELOG.md#​1150-httpswwwgithubcomgoogleapispython-videointelligencecomparev1140v1150-2020-06-09) [Compare Source](https://togithub.com/googleapis/python-videointelligence/compare/v1.14.0...v1.15.0) ##### Features - add support for streaming automl action recognition in v1p3beta1; make 'features' a positional param for annotate_video in betas ([#​31](https://www.github.com/googleapis/python-videointelligence/issues/31)) ([586f920](https://www.github.com/googleapis/python-videointelligence/commit/586f920a1932e1a813adfed500502fba0ff5edb7)), closes [#​517](https://www.github.com/googleapis/python-videointelligence/issues/517) [#​538](https://www.github.com/googleapis/python-videointelligence/issues/538) [#​565](https://www.github.com/googleapis/python-videointelligence/issues/565) [#​576](https://www.github.com/googleapis/python-videointelligence/issues/576) [#​506](https://www.github.com/googleapis/python-videointelligence/issues/506) [#​586](https://www.github.com/googleapis/python-videointelligence/issues/586) [#​585](https://www.github.com/googleapis/python-videointelligence/issues/585)
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Never, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 8b966916..5fdd76a3 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.14.0 +google-cloud-videointelligence==1.15.0 From 0c1174388c9fa647005d066f906c8ccdbd62c383 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Jul 2020 00:46:30 +0200 Subject: [PATCH 34/47] chore(deps): update dependency pytest to v5.4.3 [(#4279)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4279) * chore(deps): update dependency pytest to v5.4.3 * specify pytest for python 2 in appengine Co-authored-by: Leah Cole --- samples/shotchange/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements-test.txt b/samples/shotchange/requirements-test.txt index 781d4326..79738af5 100644 --- a/samples/shotchange/requirements-test.txt +++ b/samples/shotchange/requirements-test.txt @@ -1 +1 @@ -pytest==5.3.2 +pytest==5.4.3 From 0827a3bda255f71030e86cc5a5827d22948a307b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 1 Aug 2020 21:51:00 +0200 Subject: [PATCH 35/47] Update dependency pytest to v6 [(#4390)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4390) --- samples/shotchange/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements-test.txt b/samples/shotchange/requirements-test.txt index 79738af5..7e460c8c 100644 --- a/samples/shotchange/requirements-test.txt +++ b/samples/shotchange/requirements-test.txt @@ -1 +1 @@ -pytest==5.4.3 +pytest==6.0.1 From 01fd2f98dfaf220f0712a62d0c7952a7685c564f Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Mon, 28 Sep 2020 23:29:32 +0000 Subject: [PATCH 36/47] chore: pin sphinx --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index b0c6d59f..9f90d20c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -145,7 +145,7 @@ def docs(session): """Build the docs for this library.""" session.install("-e", ".") - session.install("sphinx", "alabaster", "recommonmark") + session.install("sphinx<=3.0.0", "alabaster", "recommonmark") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( From add572481e52406f394761876479465cb1fc43c3 Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Thu, 1 Oct 2020 22:54:51 +0000 Subject: [PATCH 37/47] chore: adds samples templates --- .kokoro/samples/python3.6/common.cfg | 6 + .kokoro/samples/python3.7/common.cfg | 6 + .kokoro/samples/python3.8/common.cfg | 6 + noxfile.py | 2 +- samples/shotchange/README.rst | 20 ++- samples/shotchange/noxfile.py | 224 +++++++++++++++++++++++++++ synth.metadata | 12 +- 7 files changed, 268 insertions(+), 8 deletions(-) create mode 100644 samples/shotchange/noxfile.py diff --git a/.kokoro/samples/python3.6/common.cfg b/.kokoro/samples/python3.6/common.cfg index f2c35a39..3c29ddaa 100644 --- a/.kokoro/samples/python3.6/common.cfg +++ b/.kokoro/samples/python3.6/common.cfg @@ -13,6 +13,12 @@ env_vars: { value: "py-3.6" } +# Declare build specific Cloud project. +env_vars: { + key: "BUILD_SPECIFIC_GCLOUD_PROJECT" + value: "python-docs-samples-tests-py36" +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-videointelligence/.kokoro/test-samples.sh" diff --git a/.kokoro/samples/python3.7/common.cfg b/.kokoro/samples/python3.7/common.cfg index c5274327..e315e2d1 100644 --- a/.kokoro/samples/python3.7/common.cfg +++ b/.kokoro/samples/python3.7/common.cfg @@ -13,6 +13,12 @@ env_vars: { value: "py-3.7" } +# Declare build specific Cloud project. +env_vars: { + key: "BUILD_SPECIFIC_GCLOUD_PROJECT" + value: "python-docs-samples-tests-py37" +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-videointelligence/.kokoro/test-samples.sh" diff --git a/.kokoro/samples/python3.8/common.cfg b/.kokoro/samples/python3.8/common.cfg index 6c613929..6647f9c2 100644 --- a/.kokoro/samples/python3.8/common.cfg +++ b/.kokoro/samples/python3.8/common.cfg @@ -13,6 +13,12 @@ env_vars: { value: "py-3.8" } +# Declare build specific Cloud project. +env_vars: { + key: "BUILD_SPECIFIC_GCLOUD_PROJECT" + value: "python-docs-samples-tests-py38" +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/python-videointelligence/.kokoro/test-samples.sh" diff --git a/noxfile.py b/noxfile.py index c0081b20..6ba5a347 100644 --- a/noxfile.py +++ b/noxfile.py @@ -149,7 +149,7 @@ def docs(session): """Build the docs for this library.""" session.install("-e", ".") - session.install("sphinx<=3.0.0", "alabaster", "recommonmark") + session.install("sphinx", "alabaster", "recommonmark") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index f70472a3..dea14f6e 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -1,3 +1,4 @@ + .. This file is automatically generated. Do not edit this file directly. Google Cloud Video Intelligence API Python Samples @@ -14,10 +15,12 @@ This directory contains samples for Google Cloud Video Intelligence API. `Google .. _Google Cloud Video Intelligence API: https://cloud.google.com/video-intelligence/docs + Setup ------------------------------------------------------------------------------- + Authentication ++++++++++++++ @@ -28,6 +31,9 @@ credentials for applications. .. _Authentication Getting Started Guide: https://cloud.google.com/docs/authentication/getting-started + + + Install Dependencies ++++++++++++++++++++ @@ -42,7 +48,7 @@ Install Dependencies .. _Python Development Environment Setup Guide: https://cloud.google.com/python/setup -#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. +#. Create a virtualenv. Samples are compatible with Python 3.6+. .. code-block:: bash @@ -58,9 +64,15 @@ Install Dependencies .. _pip: https://pip.pypa.io/ .. _virtualenv: https://virtualenv.pypa.io/ + + + + + Samples ------------------------------------------------------------------------------- + Shot Change Detection +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -76,6 +88,7 @@ To run this sample: $ python shotchange.py + usage: shotchange.py [-h] path This application demonstrates how to identify all different shots @@ -98,6 +111,10 @@ To run this sample: + + + + The client library ------------------------------------------------------------------------------- @@ -113,4 +130,5 @@ to `browse the source`_ and `report issues`_. https://github.com/GoogleCloudPlatform/google-cloud-python/issues + .. _Google Cloud SDK: https://cloud.google.com/sdk/ diff --git a/samples/shotchange/noxfile.py b/samples/shotchange/noxfile.py new file mode 100644 index 00000000..ba55d7ce --- /dev/null +++ b/samples/shotchange/noxfile.py @@ -0,0 +1,224 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function + +import os +from pathlib import Path +import sys + +import nox + + +# WARNING - WARNING - WARNING - WARNING - WARNING +# WARNING - WARNING - WARNING - WARNING - WARNING +# DO NOT EDIT THIS FILE EVER! +# WARNING - WARNING - WARNING - WARNING - WARNING +# WARNING - WARNING - WARNING - WARNING - WARNING + +# Copy `noxfile_config.py` to your directory and modify it instead. + + +# `TEST_CONFIG` dict is a configuration hook that allows users to +# modify the test configurations. The values here should be in sync +# with `noxfile_config.py`. Users will copy `noxfile_config.py` into +# their directory and modify it. + +TEST_CONFIG = { + # You can opt out from the test for specific Python versions. + 'ignored_versions': ["2.7"], + + # An envvar key for determining the project id to use. Change it + # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a + # build specific Cloud project. You can also use your own string + # to use your own Cloud project. + 'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT', + # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', + + # A dictionary you want to inject into your test. Don't put any + # secrets here. These values will override predefined values. + 'envs': {}, +} + + +try: + # Ensure we can import noxfile_config in the project's directory. + sys.path.append('.') + from noxfile_config import TEST_CONFIG_OVERRIDE +except ImportError as e: + print("No user noxfile_config found: detail: {}".format(e)) + TEST_CONFIG_OVERRIDE = {} + +# Update the TEST_CONFIG with the user supplied values. +TEST_CONFIG.update(TEST_CONFIG_OVERRIDE) + + +def get_pytest_env_vars(): + """Returns a dict for pytest invocation.""" + ret = {} + + # Override the GCLOUD_PROJECT and the alias. + env_key = TEST_CONFIG['gcloud_project_env'] + # This should error out if not set. + ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key] + + # Apply user supplied envs. + ret.update(TEST_CONFIG['envs']) + return ret + + +# DO NOT EDIT - automatically generated. +# All versions used to tested samples. +ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8"] + +# Any default versions that should be ignored. +IGNORED_VERSIONS = TEST_CONFIG['ignored_versions'] + +TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) + +INSTALL_LIBRARY_FROM_SOURCE = bool(os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False)) +# +# Style Checks +# + + +def _determine_local_import_names(start_dir): + """Determines all import names that should be considered "local". + + This is used when running the linter to insure that import order is + properly checked. + """ + file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)] + return [ + basename + for basename, extension in file_ext_pairs + if extension == ".py" + or os.path.isdir(os.path.join(start_dir, basename)) + and basename not in ("__pycache__") + ] + + +# Linting with flake8. +# +# We ignore the following rules: +# E203: whitespace before ‘:’ +# E266: too many leading ‘#’ for block comment +# E501: line too long +# I202: Additional newline in a section of imports +# +# We also need to specify the rules which are ignored by default: +# ['E226', 'W504', 'E126', 'E123', 'W503', 'E24', 'E704', 'E121'] +FLAKE8_COMMON_ARGS = [ + "--show-source", + "--builtin=gettext", + "--max-complexity=20", + "--import-order-style=google", + "--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py", + "--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202", + "--max-line-length=88", +] + + +@nox.session +def lint(session): + session.install("flake8", "flake8-import-order") + + local_names = _determine_local_import_names(".") + args = FLAKE8_COMMON_ARGS + [ + "--application-import-names", + ",".join(local_names), + "." + ] + session.run("flake8", *args) + + +# +# Sample Tests +# + + +PYTEST_COMMON_ARGS = ["--junitxml=sponge_log.xml"] + + +def _session_tests(session, post_install=None): + """Runs py.test for a particular project.""" + if os.path.exists("requirements.txt"): + session.install("-r", "requirements.txt") + + if os.path.exists("requirements-test.txt"): + session.install("-r", "requirements-test.txt") + + if INSTALL_LIBRARY_FROM_SOURCE: + session.install("-e", _get_repo_root()) + + if post_install: + post_install(session) + + session.run( + "pytest", + *(PYTEST_COMMON_ARGS + session.posargs), + # Pytest will return 5 when no tests are collected. This can happen + # on travis where slow and flaky tests are excluded. + # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html + success_codes=[0, 5], + env=get_pytest_env_vars() + ) + + +@nox.session(python=ALL_VERSIONS) +def py(session): + """Runs py.test for a sample using the specified version of Python.""" + if session.python in TESTED_VERSIONS: + _session_tests(session) + else: + session.skip("SKIPPED: {} tests are disabled for this sample.".format( + session.python + )) + + +# +# Readmegen +# + + +def _get_repo_root(): + """ Returns the root folder of the project. """ + # Get root of this repository. Assume we don't have directories nested deeper than 10 items. + p = Path(os.getcwd()) + for i in range(10): + if p is None: + break + if Path(p / ".git").exists(): + return str(p) + p = p.parent + raise Exception("Unable to detect repository root.") + + +GENERATED_READMES = sorted([x for x in Path(".").rglob("*.rst.in")]) + + +@nox.session +@nox.parametrize("path", GENERATED_READMES) +def readmegen(session, path): + """(Re-)generates the readme for a sample.""" + session.install("jinja2", "pyyaml") + dir_ = os.path.dirname(path) + + if os.path.exists(os.path.join(dir_, "requirements.txt")): + session.install("-r", os.path.join(dir_, "requirements.txt")) + + in_file = os.path.join(dir_, "README.rst.in") + session.run( + "python", _get_repo_root() + "/scripts/readme-gen/readme_gen.py", in_file + ) diff --git a/synth.metadata b/synth.metadata index 972a2af2..85bd71d2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -3,30 +3,30 @@ { "git": { "name": ".", - "remote": "git@github.com:danoscarmike/python-videointelligence", - "sha": "7613d6b7734f439dcd1e300202d6af2fd1b88514" + "remote": "git@github.com:googleapis/python-videointelligence.git", + "sha": "7a8da9f8dca6ac2c0af59558f97eb4a7114398a9" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a7eff611370b2c17050eee9da1c168bc156e3e91", - "internalRef": "334188571" + "sha": "3738209d5e12f97b208213bd66359bf4c9d12245", + "internalRef": "334908430" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "da29da32b3a988457b49ae290112b74f14b713cc" + "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "da29da32b3a988457b49ae290112b74f14b713cc" + "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" } } ], From 5a08c9d98d31f4b6449c6dac4c7cfe8521f51ecb Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Thu, 1 Oct 2020 23:02:15 +0000 Subject: [PATCH 38/47] chore: temporarily pins sphinx --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 6ba5a347..f207a39f 100644 --- a/noxfile.py +++ b/noxfile.py @@ -149,7 +149,7 @@ def docs(session): """Build the docs for this library.""" session.install("-e", ".") - session.install("sphinx", "alabaster", "recommonmark") + session.install("sphinx<3.0.0", "alabaster", "recommonmark") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( From f5a9a0b9d2336aafeec7379666ff61b1137d719e Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Fri, 2 Oct 2020 21:51:39 +0000 Subject: [PATCH 39/47] chore: blacken noxfile --- noxfile.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/noxfile.py b/noxfile.py index f207a39f..70162ce5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -40,7 +40,9 @@ def lint(session): """ session.install("flake8", BLACK_VERSION) session.run( - "black", "--check", *BLACK_PATHS, + "black", + "--check", + *BLACK_PATHS, ) session.run("flake8", "google", "tests") @@ -57,7 +59,8 @@ def blacken(session): """ session.install(BLACK_VERSION) session.run( - "black", *BLACK_PATHS, + "black", + *BLACK_PATHS, ) @@ -120,7 +123,9 @@ def system(session): # Install all test dependencies, then install this package into the # virtualenv's dist-packages. session.install( - "mock", "pytest", "google-cloud-testutils", + "mock", + "pytest", + "google-cloud-testutils", ) session.install("-e", ".") From e4d5e553e5730050b338050ada2ae4829104daec Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Tue, 6 Oct 2020 19:00:10 +0000 Subject: [PATCH 40/47] chore: lints --- noxfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index dccbe4d6..51cebaa4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -156,7 +156,6 @@ def docs(session): session.install("-e", ".") session.install("sphinx<3.0.0", "alabaster", "recommonmark") - shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( "sphinx-build", From 827f0e1c6f01b315f0672ff163ca564e6dc7b20a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 8 Oct 2020 20:15:19 +0200 Subject: [PATCH 41/47] chore(deps): update dependency google-cloud-videointelligence to v1.16.0 [(#4798)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4798) --- samples/shotchange/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements.txt b/samples/shotchange/requirements.txt index 5fdd76a3..85909592 100644 --- a/samples/shotchange/requirements.txt +++ b/samples/shotchange/requirements.txt @@ -1 +1 @@ -google-cloud-videointelligence==1.15.0 +google-cloud-videointelligence==1.16.0 From b324561430672818c659d4a42002f3c7c779ad13 Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Thu, 8 Oct 2020 19:52:05 +0000 Subject: [PATCH 42/47] chore: fixes flaky tests --- samples/analyze/README.rst | 27 ++++--------------- .../analyze/video_detect_faces_beta_test.py | 1 - .../video_detect_faces_gcs_beta_test.py | 1 - 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/samples/analyze/README.rst b/samples/analyze/README.rst index ef0b7ed5..05a1557c 100644 --- a/samples/analyze/README.rst +++ b/samples/analyze/README.rst @@ -1,4 +1,3 @@ - .. This file is automatically generated. Do not edit this file directly. Google Cloud Video Intelligence API Python Samples @@ -16,11 +15,13 @@ This directory contains samples for Google Cloud Video Intelligence API. `Google .. _Google Cloud Video Intelligence API: https://cloud.google.com/video-intelligence/docs + + + Setup ------------------------------------------------------------------------------- - Authentication ++++++++++++++ @@ -31,9 +32,6 @@ credentials for applications. .. _Authentication Getting Started Guide: https://cloud.google.com/docs/authentication/getting-started - - - Install Dependencies ++++++++++++++++++++ @@ -48,7 +46,7 @@ Install Dependencies .. _Python Development Environment Setup Guide: https://cloud.google.com/python/setup -#. Create a virtualenv. Samples are compatible with Python 3.6+. +#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. .. code-block:: bash @@ -64,15 +62,9 @@ Install Dependencies .. _pip: https://pip.pypa.io/ .. _virtualenv: https://virtualenv.pypa.io/ - - - - - Samples ------------------------------------------------------------------------------- - analyze +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -88,7 +80,6 @@ To run this sample: $ python analyze.py - usage: analyze.py [-h] {labels,labels_file,explicit_content,shots,transcribe,text_gcs,text_file,objects_gcs,objects_file} ... @@ -124,8 +115,6 @@ To run this sample: - - beta samples +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -141,7 +130,6 @@ To run this sample: $ python beta_snippets.py - usage: beta_snippets.py [-h] {transcription,video-text-gcs,video-text,track-objects-gcs,track-objects,streaming-labels,streaming-shot-change,streaming-objects,streaming-explicit-content,streaming-annotation-storage,streaming-automl-classification} ... @@ -189,10 +177,6 @@ To run this sample: - - - - The client library ------------------------------------------------------------------------------- @@ -208,5 +192,4 @@ to `browse the source`_ and `report issues`_. https://github.com/GoogleCloudPlatform/google-cloud-python/issues - -.. _Google Cloud SDK: https://cloud.google.com/sdk/ +.. _Google Cloud SDK: https://cloud.google.com/sdk/ \ No newline at end of file diff --git a/samples/analyze/video_detect_faces_beta_test.py b/samples/analyze/video_detect_faces_beta_test.py index 175f2b48..5a4ef9a9 100644 --- a/samples/analyze/video_detect_faces_beta_test.py +++ b/samples/analyze/video_detect_faces_beta_test.py @@ -30,4 +30,3 @@ def test_detect_faces(capsys): out, _ = capsys.readouterr() assert "Face detected:" in out - assert "Attributes:" in out diff --git a/samples/analyze/video_detect_faces_gcs_beta_test.py b/samples/analyze/video_detect_faces_gcs_beta_test.py index e4f666ae..3adecf60 100644 --- a/samples/analyze/video_detect_faces_gcs_beta_test.py +++ b/samples/analyze/video_detect_faces_gcs_beta_test.py @@ -30,4 +30,3 @@ def test_detect_faces(capsys): out, _ = capsys.readouterr() assert "Face detected:" in out - assert "Attributes:" in out From 81fe38834db3092fe4965eb5d8d5cb758c0bfe08 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 14 Oct 2020 22:11:23 +0200 Subject: [PATCH 43/47] chore(deps): update dependency pytest to v6.1.1 [(#4761)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4761) --- samples/shotchange/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements-test.txt b/samples/shotchange/requirements-test.txt index 7e460c8c..be53becf 100644 --- a/samples/shotchange/requirements-test.txt +++ b/samples/shotchange/requirements-test.txt @@ -1 +1 @@ -pytest==6.0.1 +pytest==6.1.1 From 330a5f6cb1108975c30b92450d219fb1b9d73edd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 29 Oct 2020 23:07:00 +0100 Subject: [PATCH 44/47] chore(deps): update dependency pytest to v6.1.2 [(#4921)](https://github.com/GoogleCloudPlatform/python-docs-samples/issues/4921) Co-authored-by: Charles Engelke --- samples/shotchange/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/shotchange/requirements-test.txt b/samples/shotchange/requirements-test.txt index be53becf..b54b1d6f 100644 --- a/samples/shotchange/requirements-test.txt +++ b/samples/shotchange/requirements-test.txt @@ -1 +1 @@ -pytest==6.1.1 +pytest==6.1.2 From a02408c53e9319598a2deeb499f32087b2a687de Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Mon, 16 Nov 2020 23:21:53 +0000 Subject: [PATCH 45/47] chore: updates samples templates --- samples/quickstart/noxfile.py | 34 ++--- samples/shotchange/README.rst | 20 ++- samples/shotchange/noxfile.py | 246 ++++++++++++++++++++++++++++++++++ synth.metadata | 10 +- 4 files changed, 287 insertions(+), 23 deletions(-) create mode 100644 samples/shotchange/noxfile.py diff --git a/samples/quickstart/noxfile.py b/samples/quickstart/noxfile.py index ab2c4922..b90eef00 100644 --- a/samples/quickstart/noxfile.py +++ b/samples/quickstart/noxfile.py @@ -37,25 +37,28 @@ TEST_CONFIG = { # You can opt out from the test for specific Python versions. - "ignored_versions": ["2.7"], + 'ignored_versions': ["2.7"], + # Old samples are opted out of enforcing Python type hints # All new samples should feature them - "enforce_type_hints": False, + 'enforce_type_hints': False, + # An envvar key for determining the project id to use. Change it # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a # build specific Cloud project. You can also use your own string # to use your own Cloud project. - "gcloud_project_env": "GOOGLE_CLOUD_PROJECT", + 'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT', # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', + # A dictionary you want to inject into your test. Don't put any # secrets here. These values will override predefined values. - "envs": {}, + 'envs': {}, } try: # Ensure we can import noxfile_config in the project's directory. - sys.path.append(".") + sys.path.append('.') from noxfile_config import TEST_CONFIG_OVERRIDE except ImportError as e: print("No user noxfile_config found: detail: {}".format(e)) @@ -70,12 +73,12 @@ def get_pytest_env_vars(): ret = {} # Override the GCLOUD_PROJECT and the alias. - env_key = TEST_CONFIG["gcloud_project_env"] + env_key = TEST_CONFIG['gcloud_project_env'] # This should error out if not set. - ret["GOOGLE_CLOUD_PROJECT"] = os.environ[env_key] + ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key] # Apply user supplied envs. - ret.update(TEST_CONFIG["envs"]) + ret.update(TEST_CONFIG['envs']) return ret @@ -84,7 +87,7 @@ def get_pytest_env_vars(): ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8"] # Any default versions that should be ignored. -IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"] +IGNORED_VERSIONS = TEST_CONFIG['ignored_versions'] TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) @@ -133,7 +136,7 @@ def _determine_local_import_names(start_dir): @nox.session def lint(session): - if not TEST_CONFIG["enforce_type_hints"]: + if not TEST_CONFIG['enforce_type_hints']: session.install("flake8", "flake8-import-order") else: session.install("flake8", "flake8-import-order", "flake8-annotations") @@ -142,11 +145,9 @@ def lint(session): args = FLAKE8_COMMON_ARGS + [ "--application-import-names", ",".join(local_names), - ".", + "." ] session.run("flake8", *args) - - # # Black # @@ -159,7 +160,6 @@ def blacken(session): session.run("black", *python_files) - # # Sample Tests # @@ -199,9 +199,9 @@ def py(session): if session.python in TESTED_VERSIONS: _session_tests(session) else: - session.skip( - "SKIPPED: {} tests are disabled for this sample.".format(session.python) - ) + session.skip("SKIPPED: {} tests are disabled for this sample.".format( + session.python + )) # diff --git a/samples/shotchange/README.rst b/samples/shotchange/README.rst index f70472a3..dea14f6e 100644 --- a/samples/shotchange/README.rst +++ b/samples/shotchange/README.rst @@ -1,3 +1,4 @@ + .. This file is automatically generated. Do not edit this file directly. Google Cloud Video Intelligence API Python Samples @@ -14,10 +15,12 @@ This directory contains samples for Google Cloud Video Intelligence API. `Google .. _Google Cloud Video Intelligence API: https://cloud.google.com/video-intelligence/docs + Setup ------------------------------------------------------------------------------- + Authentication ++++++++++++++ @@ -28,6 +31,9 @@ credentials for applications. .. _Authentication Getting Started Guide: https://cloud.google.com/docs/authentication/getting-started + + + Install Dependencies ++++++++++++++++++++ @@ -42,7 +48,7 @@ Install Dependencies .. _Python Development Environment Setup Guide: https://cloud.google.com/python/setup -#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. +#. Create a virtualenv. Samples are compatible with Python 3.6+. .. code-block:: bash @@ -58,9 +64,15 @@ Install Dependencies .. _pip: https://pip.pypa.io/ .. _virtualenv: https://virtualenv.pypa.io/ + + + + + Samples ------------------------------------------------------------------------------- + Shot Change Detection +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -76,6 +88,7 @@ To run this sample: $ python shotchange.py + usage: shotchange.py [-h] path This application demonstrates how to identify all different shots @@ -98,6 +111,10 @@ To run this sample: + + + + The client library ------------------------------------------------------------------------------- @@ -113,4 +130,5 @@ to `browse the source`_ and `report issues`_. https://github.com/GoogleCloudPlatform/google-cloud-python/issues + .. _Google Cloud SDK: https://cloud.google.com/sdk/ diff --git a/samples/shotchange/noxfile.py b/samples/shotchange/noxfile.py new file mode 100644 index 00000000..b90eef00 --- /dev/null +++ b/samples/shotchange/noxfile.py @@ -0,0 +1,246 @@ +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import print_function + +import os +from pathlib import Path +import sys + +import nox + + +# WARNING - WARNING - WARNING - WARNING - WARNING +# WARNING - WARNING - WARNING - WARNING - WARNING +# DO NOT EDIT THIS FILE EVER! +# WARNING - WARNING - WARNING - WARNING - WARNING +# WARNING - WARNING - WARNING - WARNING - WARNING + +# Copy `noxfile_config.py` to your directory and modify it instead. + + +# `TEST_CONFIG` dict is a configuration hook that allows users to +# modify the test configurations. The values here should be in sync +# with `noxfile_config.py`. Users will copy `noxfile_config.py` into +# their directory and modify it. + +TEST_CONFIG = { + # You can opt out from the test for specific Python versions. + 'ignored_versions': ["2.7"], + + # Old samples are opted out of enforcing Python type hints + # All new samples should feature them + 'enforce_type_hints': False, + + # An envvar key for determining the project id to use. Change it + # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a + # build specific Cloud project. You can also use your own string + # to use your own Cloud project. + 'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT', + # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', + + # A dictionary you want to inject into your test. Don't put any + # secrets here. These values will override predefined values. + 'envs': {}, +} + + +try: + # Ensure we can import noxfile_config in the project's directory. + sys.path.append('.') + from noxfile_config import TEST_CONFIG_OVERRIDE +except ImportError as e: + print("No user noxfile_config found: detail: {}".format(e)) + TEST_CONFIG_OVERRIDE = {} + +# Update the TEST_CONFIG with the user supplied values. +TEST_CONFIG.update(TEST_CONFIG_OVERRIDE) + + +def get_pytest_env_vars(): + """Returns a dict for pytest invocation.""" + ret = {} + + # Override the GCLOUD_PROJECT and the alias. + env_key = TEST_CONFIG['gcloud_project_env'] + # This should error out if not set. + ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key] + + # Apply user supplied envs. + ret.update(TEST_CONFIG['envs']) + return ret + + +# DO NOT EDIT - automatically generated. +# All versions used to tested samples. +ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8"] + +# Any default versions that should be ignored. +IGNORED_VERSIONS = TEST_CONFIG['ignored_versions'] + +TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) + +INSTALL_LIBRARY_FROM_SOURCE = bool(os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False)) +# +# Style Checks +# + + +def _determine_local_import_names(start_dir): + """Determines all import names that should be considered "local". + + This is used when running the linter to insure that import order is + properly checked. + """ + file_ext_pairs = [os.path.splitext(path) for path in os.listdir(start_dir)] + return [ + basename + for basename, extension in file_ext_pairs + if extension == ".py" + or os.path.isdir(os.path.join(start_dir, basename)) + and basename not in ("__pycache__") + ] + + +# Linting with flake8. +# +# We ignore the following rules: +# E203: whitespace before ‘:’ +# E266: too many leading ‘#’ for block comment +# E501: line too long +# I202: Additional newline in a section of imports +# +# We also need to specify the rules which are ignored by default: +# ['E226', 'W504', 'E126', 'E123', 'W503', 'E24', 'E704', 'E121'] +FLAKE8_COMMON_ARGS = [ + "--show-source", + "--builtin=gettext", + "--max-complexity=20", + "--import-order-style=google", + "--exclude=.nox,.cache,env,lib,generated_pb2,*_pb2.py,*_pb2_grpc.py", + "--ignore=E121,E123,E126,E203,E226,E24,E266,E501,E704,W503,W504,I202", + "--max-line-length=88", +] + + +@nox.session +def lint(session): + if not TEST_CONFIG['enforce_type_hints']: + session.install("flake8", "flake8-import-order") + else: + session.install("flake8", "flake8-import-order", "flake8-annotations") + + local_names = _determine_local_import_names(".") + args = FLAKE8_COMMON_ARGS + [ + "--application-import-names", + ",".join(local_names), + "." + ] + session.run("flake8", *args) +# +# Black +# + + +@nox.session +def blacken(session): + session.install("black") + python_files = [path for path in os.listdir(".") if path.endswith(".py")] + + session.run("black", *python_files) + +# +# Sample Tests +# + + +PYTEST_COMMON_ARGS = ["--junitxml=sponge_log.xml"] + + +def _session_tests(session, post_install=None): + """Runs py.test for a particular project.""" + if os.path.exists("requirements.txt"): + session.install("-r", "requirements.txt") + + if os.path.exists("requirements-test.txt"): + session.install("-r", "requirements-test.txt") + + if INSTALL_LIBRARY_FROM_SOURCE: + session.install("-e", _get_repo_root()) + + if post_install: + post_install(session) + + session.run( + "pytest", + *(PYTEST_COMMON_ARGS + session.posargs), + # Pytest will return 5 when no tests are collected. This can happen + # on travis where slow and flaky tests are excluded. + # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html + success_codes=[0, 5], + env=get_pytest_env_vars() + ) + + +@nox.session(python=ALL_VERSIONS) +def py(session): + """Runs py.test for a sample using the specified version of Python.""" + if session.python in TESTED_VERSIONS: + _session_tests(session) + else: + session.skip("SKIPPED: {} tests are disabled for this sample.".format( + session.python + )) + + +# +# Readmegen +# + + +def _get_repo_root(): + """ Returns the root folder of the project. """ + # Get root of this repository. Assume we don't have directories nested deeper than 10 items. + p = Path(os.getcwd()) + for i in range(10): + if p is None: + break + if Path(p / ".git").exists(): + return str(p) + # .git is not available in repos cloned via Cloud Build + # setup.py is always in the library's root, so use that instead + # https://github.com/googleapis/synthtool/issues/792 + if Path(p / "setup.py").exists(): + return str(p) + p = p.parent + raise Exception("Unable to detect repository root.") + + +GENERATED_READMES = sorted([x for x in Path(".").rglob("*.rst.in")]) + + +@nox.session +@nox.parametrize("path", GENERATED_READMES) +def readmegen(session, path): + """(Re-)generates the readme for a sample.""" + session.install("jinja2", "pyyaml") + dir_ = os.path.dirname(path) + + if os.path.exists(os.path.join(dir_, "requirements.txt")): + session.install("-r", os.path.join(dir_, "requirements.txt")) + + in_file = os.path.join(dir_, "README.rst.in") + session.run( + "python", _get_repo_root() + "/scripts/readme-gen/readme_gen.py", in_file + ) diff --git a/synth.metadata b/synth.metadata index 317908aa..f1d17fc0 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,29 +4,29 @@ "git": { "name": ".", "remote": "git@github.com:googleapis/python-videointelligence.git", - "sha": "463636e3b183a1ab836765fab761161d70f74970" + "sha": "8ecf08ee0310d149f83c6496b7fa78f603122d8a" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0c9e3f8cb3a0c75983fe9a7897f0ef048d81e999", - "internalRef": "342123525" + "sha": "6a69c750c3f01a69017662395f90515bbf1fe1ff", + "internalRef": "342721036" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e89175cf074dccc4babb4eca66ae913696e47a71" + "sha": "d5fc0bcf9ea9789c5b0e3154a9e3b29e5cea6116" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e89175cf074dccc4babb4eca66ae913696e47a71" + "sha": "d5fc0bcf9ea9789c5b0e3154a9e3b29e5cea6116" } } ], From 2de0132ca61ad8c283dc2ee1c56fb2e070e49ddd Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Wed, 18 Nov 2020 12:42:04 -0800 Subject: [PATCH 46/47] chore: cleans up merge conflicts --- noxfile.py | 4 ---- samples/shotchange/noxfile.py | 15 --------------- synth.metadata | 17 ----------------- 3 files changed, 36 deletions(-) diff --git a/noxfile.py b/noxfile.py index aebf5ae8..2b2a073e 100644 --- a/noxfile.py +++ b/noxfile.py @@ -156,11 +156,7 @@ def docs(session): """Build the docs for this library.""" session.install("-e", ".") -<<<<<<< HEAD - session.install("sphinx<3.0.0", "alabaster", "recommonmark") -======= session.install("sphinx<=3.0.0", "alabaster", "recommonmark") ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( diff --git a/samples/shotchange/noxfile.py b/samples/shotchange/noxfile.py index a937e99c..b90eef00 100644 --- a/samples/shotchange/noxfile.py +++ b/samples/shotchange/noxfile.py @@ -39,13 +39,10 @@ # You can opt out from the test for specific Python versions. 'ignored_versions': ["2.7"], -<<<<<<< HEAD -======= # Old samples are opted out of enforcing Python type hints # All new samples should feature them 'enforce_type_hints': False, ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 # An envvar key for determining the project id to use. Change it # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a # build specific Cloud project. You can also use your own string @@ -139,14 +136,10 @@ def _determine_local_import_names(start_dir): @nox.session def lint(session): -<<<<<<< HEAD - session.install("flake8", "flake8-import-order") -======= if not TEST_CONFIG['enforce_type_hints']: session.install("flake8", "flake8-import-order") else: session.install("flake8", "flake8-import-order", "flake8-annotations") ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 local_names = _determine_local_import_names(".") args = FLAKE8_COMMON_ARGS + [ @@ -155,10 +148,6 @@ def lint(session): "." ] session.run("flake8", *args) -<<<<<<< HEAD - - -======= # # Black # @@ -171,7 +160,6 @@ def blacken(session): session.run("black", *python_files) ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 # # Sample Tests # @@ -230,14 +218,11 @@ def _get_repo_root(): break if Path(p / ".git").exists(): return str(p) -<<<<<<< HEAD -======= # .git is not available in repos cloned via Cloud Build # setup.py is always in the library's root, so use that instead # https://github.com/googleapis/synthtool/issues/792 if Path(p / "setup.py").exists(): return str(p) ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 p = p.parent raise Exception("Unable to detect repository root.") diff --git a/synth.metadata b/synth.metadata index aa7f0df0..8791655f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,46 +4,29 @@ "git": { "name": ".", "remote": "git@github.com:googleapis/python-videointelligence.git", -<<<<<<< HEAD - "sha": "7a8da9f8dca6ac2c0af59558f97eb4a7114398a9" -======= "sha": "8ecf08ee0310d149f83c6496b7fa78f603122d8a" ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", -<<<<<<< HEAD - "sha": "3738209d5e12f97b208213bd66359bf4c9d12245", - "internalRef": "334908430" -======= "sha": "6a69c750c3f01a69017662395f90515bbf1fe1ff", "internalRef": "342721036" ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", -<<<<<<< HEAD - "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" -======= "sha": "d5fc0bcf9ea9789c5b0e3154a9e3b29e5cea6116" ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", -<<<<<<< HEAD - "sha": "0762e8ee2ec21cdfc4d82020b985a104feb0453b" -======= "sha": "d5fc0bcf9ea9789c5b0e3154a9e3b29e5cea6116" ->>>>>>> 3541deb2ce117e136170e7118d70ca918790af01 } } ], From e5e7dfb43104148cf7004efe3bdede2b34d57411 Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Wed, 18 Nov 2020 13:00:21 -0800 Subject: [PATCH 47/47] chore: blacken --- noxfile.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/noxfile.py b/noxfile.py index 2b2a073e..47582881 100644 --- a/noxfile.py +++ b/noxfile.py @@ -40,9 +40,7 @@ def lint(session): """ session.install("flake8", BLACK_VERSION) session.run( - "black", - "--check", - *BLACK_PATHS, + "black", "--check", *BLACK_PATHS, ) session.run("flake8", "google", "tests") @@ -59,8 +57,7 @@ def blacken(session): """ session.install(BLACK_VERSION) session.run( - "black", - *BLACK_PATHS, + "black", *BLACK_PATHS, ) @@ -125,9 +122,7 @@ def system(session): # Install all test dependencies, then install this package into the # virtualenv's dist-packages. session.install( - "mock", - "pytest", - "google-cloud-testutils", + "mock", "pytest", "google-cloud-testutils", ) session.install("-e", ".")