From 60388ff6abf4b2f4458c2cd3e646cea7d125a514 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Wed, 30 Aug 2017 02:51:02 -0700 Subject: [PATCH 1/3] Auto-update dependencies. --- appengine/flexible/sendgrid/requirements.txt | 2 +- appengine/standard/bigquery/requirements.txt | 2 +- appengine/standard/sendgrid/requirements.txt | 2 +- appengine/standard/storage/api-client/requirements.txt | 2 +- auth/api-client/requirements.txt | 2 +- bigquery/api/requirements.txt | 2 +- bigtable/hello/requirements.txt | 2 +- bigtable/hello_happybase/requirements.txt | 2 +- compute/api/requirements.txt | 2 +- compute/auth/requirements.txt | 2 +- container_engine/api-client/requirements.txt | 2 +- dataproc/requirements.txt | 2 +- .../clients/service_to_service_non_default/requirements.txt | 2 +- iot/api-client/manager/requirements.txt | 2 +- kms/api-client/requirements.txt | 2 +- language/api/requirements.txt | 2 +- language/movie_nl/requirements.txt | 2 +- language/ocr_nl/requirements.txt | 2 +- language/syntax_triples/requirements.txt | 2 +- language/tutorial/requirements.txt | 2 +- logging/api-client/requirements.txt | 2 +- ml_engine/online_prediction/requirements.txt | 2 +- monitoring/api/v2/requirements.txt | 2 +- monitoring/api/v3/api-client/requirements.txt | 2 +- storage/api/requirements.txt | 2 +- storage/transfer_service/requirements.txt | 2 +- testing/requirements.txt | 4 ++-- vision/api/label/requirements.txt | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/appengine/flexible/sendgrid/requirements.txt b/appengine/flexible/sendgrid/requirements.txt index 2123490a573f..9e8a47c390c8 100644 --- a/appengine/flexible/sendgrid/requirements.txt +++ b/appengine/flexible/sendgrid/requirements.txt @@ -1,3 +1,3 @@ Flask==0.12.2 -sendgrid==5.0.0 +sendgrid==5.0.1 gunicorn==19.7.1 diff --git a/appengine/standard/bigquery/requirements.txt b/appengine/standard/bigquery/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/appengine/standard/bigquery/requirements.txt +++ b/appengine/standard/bigquery/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/appengine/standard/sendgrid/requirements.txt b/appengine/standard/sendgrid/requirements.txt index e262556ef753..1b5aa69a87c8 100644 --- a/appengine/standard/sendgrid/requirements.txt +++ b/appengine/standard/sendgrid/requirements.txt @@ -1 +1 @@ -sendgrid==5.0.0 +sendgrid==5.0.1 diff --git a/appengine/standard/storage/api-client/requirements.txt b/appengine/standard/storage/api-client/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/appengine/standard/storage/api-client/requirements.txt +++ b/appengine/standard/storage/api-client/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/auth/api-client/requirements.txt b/auth/api-client/requirements.txt index eb1f6b43f5f3..db5fdf32fb41 100644 --- a/auth/api-client/requirements.txt +++ b/auth/api-client/requirements.txt @@ -1,3 +1,3 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 google-auth-httplib2==0.0.2 google-auth==1.0.2 diff --git a/bigquery/api/requirements.txt b/bigquery/api/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/bigquery/api/requirements.txt +++ b/bigquery/api/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/bigtable/hello/requirements.txt b/bigtable/hello/requirements.txt index 6aaa931d7a59..873ac2230c96 100644 --- a/bigtable/hello/requirements.txt +++ b/bigtable/hello/requirements.txt @@ -1,2 +1,2 @@ google-cloud-bigtable==0.27.0 -google-cloud-core==0.27.0 +google-cloud-core==0.27.1 diff --git a/bigtable/hello_happybase/requirements.txt b/bigtable/hello_happybase/requirements.txt index 05aee4625480..f0c91e09b757 100644 --- a/bigtable/hello_happybase/requirements.txt +++ b/bigtable/hello_happybase/requirements.txt @@ -1,3 +1,3 @@ google-cloud-happybase==0.26.0 google-cloud-bigtable==0.27.0 -google-cloud-core==0.27.0 +google-cloud-core==0.27.1 diff --git a/compute/api/requirements.txt b/compute/api/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/compute/api/requirements.txt +++ b/compute/api/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/compute/auth/requirements.txt b/compute/auth/requirements.txt index 4e23cab84ee8..60eca8c2bcec 100644 --- a/compute/auth/requirements.txt +++ b/compute/auth/requirements.txt @@ -1,2 +1,2 @@ requests==2.18.4 -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/container_engine/api-client/requirements.txt b/container_engine/api-client/requirements.txt index c9ad27e11d3e..c7bb238c4bb1 100644 --- a/container_engine/api-client/requirements.txt +++ b/container_engine/api-client/requirements.txt @@ -1,3 +1,3 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 google-auth==1.0.2 google-auth-httplib2==0.0.2 diff --git a/dataproc/requirements.txt b/dataproc/requirements.txt index 2059ddef0051..969c0bbd37e9 100644 --- a/dataproc/requirements.txt +++ b/dataproc/requirements.txt @@ -1,2 +1,2 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 google-cloud==0.27.0 diff --git a/endpoints/getting-started/clients/service_to_service_non_default/requirements.txt b/endpoints/getting-started/clients/service_to_service_non_default/requirements.txt index c9ad27e11d3e..c7bb238c4bb1 100644 --- a/endpoints/getting-started/clients/service_to_service_non_default/requirements.txt +++ b/endpoints/getting-started/clients/service_to_service_non_default/requirements.txt @@ -1,3 +1,3 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 google-auth==1.0.2 google-auth-httplib2==0.0.2 diff --git a/iot/api-client/manager/requirements.txt b/iot/api-client/manager/requirements.txt index c6ef9207a535..21e42e063cc3 100644 --- a/iot/api-client/manager/requirements.txt +++ b/iot/api-client/manager/requirements.txt @@ -1,4 +1,4 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 google-auth-httplib2==0.0.2 google-auth==1.0.2 google-cloud==0.27.0 diff --git a/kms/api-client/requirements.txt b/kms/api-client/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/kms/api-client/requirements.txt +++ b/kms/api-client/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/language/api/requirements.txt b/language/api/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/language/api/requirements.txt +++ b/language/api/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/language/movie_nl/requirements.txt b/language/movie_nl/requirements.txt index b072771d522a..69ae9a1934bc 100644 --- a/language/movie_nl/requirements.txt +++ b/language/movie_nl/requirements.txt @@ -1,2 +1,2 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 requests==2.18.4 diff --git a/language/ocr_nl/requirements.txt b/language/ocr_nl/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/language/ocr_nl/requirements.txt +++ b/language/ocr_nl/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/language/syntax_triples/requirements.txt b/language/syntax_triples/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/language/syntax_triples/requirements.txt +++ b/language/syntax_triples/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/language/tutorial/requirements.txt b/language/tutorial/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/language/tutorial/requirements.txt +++ b/language/tutorial/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/logging/api-client/requirements.txt b/logging/api-client/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/logging/api-client/requirements.txt +++ b/logging/api-client/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/ml_engine/online_prediction/requirements.txt b/ml_engine/online_prediction/requirements.txt index 318df34c286c..bf6f28a8c6e7 100644 --- a/ml_engine/online_prediction/requirements.txt +++ b/ml_engine/online_prediction/requirements.txt @@ -1,2 +1,2 @@ tensorflow==1.3.0 -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/monitoring/api/v2/requirements.txt b/monitoring/api/v2/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/monitoring/api/v2/requirements.txt +++ b/monitoring/api/v2/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/monitoring/api/v3/api-client/requirements.txt b/monitoring/api/v3/api-client/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/monitoring/api/v3/api-client/requirements.txt +++ b/monitoring/api/v3/api-client/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/storage/api/requirements.txt b/storage/api/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/storage/api/requirements.txt +++ b/storage/api/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/storage/transfer_service/requirements.txt b/storage/transfer_service/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/storage/transfer_service/requirements.txt +++ b/storage/transfer_service/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 diff --git a/testing/requirements.txt b/testing/requirements.txt index 9d2bf7113087..6eda45455805 100644 --- a/testing/requirements.txt +++ b/testing/requirements.txt @@ -12,6 +12,6 @@ pyyaml==3.12 responses==0.7.0 WebTest==2.0.28 webapp2==2.5.2 -google-api-python-client==1.6.2 -google-cloud-core==0.27.0 +google-api-python-client==1.6.3 +google-cloud-core==0.27.1 gcp-devrel-py-tools==0.0.11 diff --git a/vision/api/label/requirements.txt b/vision/api/label/requirements.txt index 4f77d6936d70..28ef89127f4b 100644 --- a/vision/api/label/requirements.txt +++ b/vision/api/label/requirements.txt @@ -1 +1 @@ -google-api-python-client==1.6.2 +google-api-python-client==1.6.3 From d27d3db99d672d086d7d51feade172be48b53f2d Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 30 Aug 2017 09:16:27 -0700 Subject: [PATCH 2/3] Relax assertions in the ocr_nl sample Change-Id: I6d37e5846a8d6dd52429cb30d501f448c52cbba1 --- language/ocr_nl/main_test.py | 2 -- pytest.ini | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/language/ocr_nl/main_test.py b/language/ocr_nl/main_test.py index afaf2e16576c..e4bf2b5174fb 100755 --- a/language/ocr_nl/main_test.py +++ b/language/ocr_nl/main_test.py @@ -66,7 +66,6 @@ def test_text_returns_entities(): etype, ename, salience, wurl = text_analyzer.extract_entity_info( entities[0]) assert ename == 'holmes' - assert wurl == 'http://en.wikipedia.org/wiki/Sherlock_Holmes' def test_entities_list(): @@ -80,7 +79,6 @@ def test_entities_list(): etype, ename, salience, wurl = text_analyzer.extract_entity_info( entities[0]) assert ename == 'bennet' - assert wurl == 'http://en.wikipedia.org/wiki/Mr_Bennet' def test_main(tmpdir, capsys): diff --git a/pytest.ini b/pytest.ini index db756347a017..2008cdfaf071 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,4 +2,5 @@ addopts = -v --no-success-flaky-report + --tb=native norecursedirs = .git env lib .tox .nox From bcb862ea7301813000f151c40d015b28784e1e70 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Wed, 30 Aug 2017 09:40:23 -0700 Subject: [PATCH 3/3] Drop unused logging apiary samples Change-Id: I545718283773cb729a5e0def8a76ebfa40829d51 --- logging/api-client/README.rst | 87 ---------------------------- logging/api-client/README.rst.in | 18 ------ logging/api-client/list_logs.py | 67 --------------------- logging/api-client/list_logs_test.py | 25 -------- logging/api-client/requirements.txt | 1 - 5 files changed, 198 deletions(-) delete mode 100644 logging/api-client/README.rst delete mode 100644 logging/api-client/README.rst.in delete mode 100644 logging/api-client/list_logs.py delete mode 100644 logging/api-client/list_logs_test.py delete mode 100644 logging/api-client/requirements.txt diff --git a/logging/api-client/README.rst b/logging/api-client/README.rst deleted file mode 100644 index 0497021d5ec0..000000000000 --- a/logging/api-client/README.rst +++ /dev/null @@ -1,87 +0,0 @@ -.. This file is automatically generated. Do not edit this file directly. - -Stackdriver Logging Python Samples -=============================================================================== - -This directory contains samples for Stackdriver Logging. `Stackdriver Logging`_ allows you to store, search, analyze, monitor, and alert on log data and events from Google Cloud Platform and Amazon Web Services. - - - - -.. _Stackdriver Logging: https://cloud.google.com/logging/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 -------------------------------------------------------------------------------- - -List logs -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - - -To run this sample: - -.. code-block:: bash - - $ python list_logs.py - - - - -.. _Google Cloud SDK: https://cloud.google.com/sdk/ \ No newline at end of file diff --git a/logging/api-client/README.rst.in b/logging/api-client/README.rst.in deleted file mode 100644 index 5585c9193178..000000000000 --- a/logging/api-client/README.rst.in +++ /dev/null @@ -1,18 +0,0 @@ -# This file is used to generate README.rst - -product: - name: Stackdriver Logging - short_name: Stackdriver Logging - url: https://cloud.google.com/logging/docs - description: > - `Stackdriver Logging`_ allows you to store, search, analyze, monitor, - and alert on log data and events from Google Cloud Platform and Amazon - Web Services. - -setup: -- auth -- install_deps - -samples: -- name: List logs - file: list_logs.py diff --git a/logging/api-client/list_logs.py b/logging/api-client/list_logs.py deleted file mode 100644 index be95997fc5ac..000000000000 --- a/logging/api-client/list_logs.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python - -# Copyright 2015 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. - -"""Command-line program to list the logs in a Google Cloud Platform project. - -This sample is used in this section of the documentation: - - https://cloud.google.com/logging/docs - -For more information, see the README.md under /cloud_logging. -""" - -# [START all] -import argparse - -import googleapiclient.discovery - - -# [START list_logs] -def list_logs(project_id, logging_service): - request = logging_service.projects().logs().list(projectsId=project_id) - - while request: - response = request.execute() - if not response: - print("No logs found in {0} project").format(project_id) - return False - - for log in response['logs']: - print(log['name']) - - request = logging_service.projects().logs().list_next( - request, response) -# [END list_logs] - - -def main(project_id): - # [START build_service] - logging_service = googleapiclient.discovery.build('logging', 'v1beta3') - # [END build_service] - - list_logs(project_id, logging_service) - - -if __name__ == '__main__': - parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - parser.add_argument('project_id', help='Your Google Cloud project ID.') - - args = parser.parse_args() - - main(args.project_id) -# [END all] diff --git a/logging/api-client/list_logs_test.py b/logging/api-client/list_logs_test.py deleted file mode 100644 index 7b17c06f5b9a..000000000000 --- a/logging/api-client/list_logs_test.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2015, 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 re - -import list_logs - -PROJECT = os.environ['GCLOUD_PROJECT'] - - -def test_main(capsys): - list_logs.main(PROJECT) - out, _ = capsys.readouterr() - assert re.search(re.compile(r'.*', re.S), out) diff --git a/logging/api-client/requirements.txt b/logging/api-client/requirements.txt deleted file mode 100644 index 28ef89127f4b..000000000000 --- a/logging/api-client/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -google-api-python-client==1.6.3