From 622705761fdfd42faa68dc23759ac9b43a053952 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 12 Aug 2021 15:55:39 +0000 Subject: [PATCH 01/12] chore(python): avoid `.nox` directories when building docs (#30) Source-Link: https://github.com/googleapis/synthtool/commit/7e1f6da50524b5d98eb67adbf6dd0805df54233d Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:a1a891041baa4ffbe1a809ac1b8b9b4a71887293c9101c88e8e255943c5aec2d --- .github/.OwlBot.lock.yaml | 2 +- docs/conf.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ee60f7..b771c37 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:aea14a583128771ae8aefa364e1652f3c56070168ef31beb203534222d842b8b + digest: sha256:a1a891041baa4ffbe1a809ac1b8b9b4a71887293c9101c88e8e255943c5aec2d diff --git a/docs/conf.py b/docs/conf.py index 573e9fc..c6ff8ae 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -110,6 +110,7 @@ # directories to ignore when looking for source files. exclude_patterns = [ "_build", + "**/.nox/**/*", "samples/AUTHORING_GUIDE.md", "samples/CONTRIBUTING.md", "samples/snippets/README.rst", From a2531329022e3248c9feb7994f4e18cd9f029102 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 13 Aug 2021 11:27:34 -0400 Subject: [PATCH 02/12] chore: drop mention of Python 2.7 from templates (#31) Source-Link: https://github.com/googleapis/synthtool/commit/facee4cc1ea096cd8bcc008bb85929daa7c414c0 Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- noxfile.py | 12 +++++++++--- scripts/readme-gen/templates/install_deps.tmpl.rst | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b771c37..a9fcd07 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:a1a891041baa4ffbe1a809ac1b8b9b4a71887293c9101c88e8e255943c5aec2d + digest: sha256:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803 diff --git a/noxfile.py b/noxfile.py index d896e7f..935a924 100644 --- a/noxfile.py +++ b/noxfile.py @@ -84,9 +84,15 @@ def default(session): constraints_path = str( CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" ) - session.install("asyncmock", "pytest-asyncio", "-c", constraints_path) - - session.install("mock", "pytest", "pytest-cov", "-c", constraints_path) + session.install( + "mock", + "asyncmock", + "pytest", + "pytest-cov", + "pytest-asyncio", + "-c", + constraints_path, + ) session.install("-e", ".", "-c", constraints_path) diff --git a/scripts/readme-gen/templates/install_deps.tmpl.rst b/scripts/readme-gen/templates/install_deps.tmpl.rst index a0406db..275d649 100644 --- a/scripts/readme-gen/templates/install_deps.tmpl.rst +++ b/scripts/readme-gen/templates/install_deps.tmpl.rst @@ -12,7 +12,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 From e3c6570012b94d8ef8ea61486371c446bfe86c0f Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 18 Aug 2021 07:41:10 -0600 Subject: [PATCH 03/12] chore: generate python samples templates in owlbot.py (#32) Generate python samples templates in owlbot.py --- owlbot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/owlbot.py b/owlbot.py index 4ad7041..b4a89ff 100644 --- a/owlbot.py +++ b/owlbot.py @@ -38,6 +38,7 @@ # ---------------------------------------------------------------------------- templated_files = gcp.CommonTemplates().py_library(microgenerator=True) +python.py_samples(skip_readmes=True) s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file # ---------------------------------------------------------------------------- From 6360dda7756f1ee0ef9b9346a7ba24c4111d816f Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Wed, 25 Aug 2021 12:57:21 -0400 Subject: [PATCH 04/12] chore: migrate to main branch (#34) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: migrate to main branch * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: update owlbot * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- .kokoro/build.sh | 2 +- .kokoro/test-samples-impl.sh | 2 +- CONTRIBUTING.rst | 12 +++++------ docs/conf.py | 10 ++++----- owlbot.py | 41 ++++++++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index cd48ca8..a2bade6 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox python3 -m nox --version # If this is a continuous build, send the test log to the FlakyBot. -# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot. +# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot. if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then cleanup() { chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh index 311a8d5..8a324c9 100755 --- a/.kokoro/test-samples-impl.sh +++ b/.kokoro/test-samples-impl.sh @@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do EXIT=$? # If this is a periodic build, send the test log to the FlakyBot. - # See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot. + # See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot. if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot $KOKORO_GFILE_DIR/linux_amd64/flakybot diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 85124e3..7ec4ff5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout: # Configure remotes such that you can pull changes from the googleapis/python-dms # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-dms.git - # fetch and merge changes from upstream into master + # fetch and merge changes from upstream into main $ git fetch upstream - $ git merge upstream/master + $ git merge upstream/main Now your local repo is set up such that you will push changes to your GitHub repo, from which you can submit a pull request. @@ -110,12 +110,12 @@ Coding Style variables:: export GOOGLE_CLOUD_TESTING_REMOTE="upstream" - export GOOGLE_CLOUD_TESTING_BRANCH="master" + export GOOGLE_CLOUD_TESTING_BRANCH="main" By doing this, you are specifying the location of the most up-to-date version of ``python-dms``. The the suggested remote name ``upstream`` should point to the official ``googleapis`` checkout and the - the branch should be the main branch on that remote (``master``). + the branch should be the main branch on that remote (``main``). - This repository contains configuration for the `pre-commit `__ tool, which automates checking @@ -209,7 +209,7 @@ The `description on PyPI`_ for the project comes directly from the ``README``. Due to the reStructuredText (``rst``) parser used by PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst`` instead of -``https://github.com/googleapis/python-dms/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-dms/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-dms @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-dms/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-dms/blob/main/noxfile.py We also explicitly decided to support Python 3 beginning with version 3.6. diff --git a/docs/conf.py b/docs/conf.py index c6ff8ae..a5f4232 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,8 +76,8 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = "index" +# The main toctree document. +root_doc = "index" # General information about the project. project = "google-cloud-dms" @@ -280,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-dms.tex", "google-cloud-dms Documentation", author, @@ -314,7 +314,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, "google-cloud-dms", "google-cloud-dms Documentation", [author], 1,) + (root_doc, "google-cloud-dms", "google-cloud-dms Documentation", [author], 1,) ] # If true, show URL addresses after external links. @@ -328,7 +328,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-dms", "google-cloud-dms Documentation", author, diff --git a/owlbot.py b/owlbot.py index b4a89ff..8474134 100644 --- a/owlbot.py +++ b/owlbot.py @@ -46,3 +46,44 @@ # ---------------------------------------------------------------------------- s.shell.run(["nox", "-s", "blacken"], hide_output=False) + +# ---------------------------------------------------------------------------- +# Main Branch migration +# ---------------------------------------------------------------------------- + +s.replace( + "*.rst", + "master", + "main" +) + +s.replace( + "README.rst", + "google-cloud-python/blob/main/README.rst", + "google-cloud-python/blob/master/README.rst" +) + +s.replace( + "CONTRIBUTING.rst", + "kubernetes/community/blob/main", + "kubernetes/community/blob/master" +) + +s.replace( + "docs/conf.py", + "master", + "main" +) + +s.replace( + "docs/conf.py", + "main_doc", + "root_doc" +) + +s.replace( + ".kokoro/*", + "master", + "main" +) + From 70c0cb42d97857cfc7aae861ca89b8eac680c9e7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 15:28:32 +0000 Subject: [PATCH 05/12] chore(python): disable dependency dashboard (#36) --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a9fcd07..b75186c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803 + digest: sha256:d6761eec279244e57fe9d21f8343381a01d3632c034811a72f68b83119e58c69 diff --git a/renovate.json b/renovate.json index c048955..9fa8816 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,8 @@ { "extends": [ - "config:base", ":preserveSemverRanges" + "config:base", + ":preserveSemverRanges", + ":disableDependencyDashboard" ], "ignorePaths": [".pre-commit-config.yaml"], "pip_requirements": { From 6898634f5aaf4c2f019909588b12f4a2e95cf67a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 15:46:32 +0000 Subject: [PATCH 06/12] chore(python): group renovate prs (#37) --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b75186c..ef3cb34 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:d6761eec279244e57fe9d21f8343381a01d3632c034811a72f68b83119e58c69 + digest: sha256:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7 diff --git a/renovate.json b/renovate.json index 9fa8816..c21036d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,7 @@ { "extends": [ "config:base", + "group:all", ":preserveSemverRanges", ":disableDependencyDashboard" ], From 4b6d95ab95efc8493e4fc2d4e0d36f3a3ca35d38 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 16:57:27 -0600 Subject: [PATCH 07/12] chore(python): rename default branch to main (#38) Source-Link: https://github.com/googleapis/synthtool/commit/5c0fa62eea9c33ebe61e582424b659eb264e1ba4 Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- CONTRIBUTING.rst | 6 +++--- docs/conf.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index ef3cb34..c07f148 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7 + digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7ec4ff5..15de7a3 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -113,9 +113,9 @@ Coding Style export GOOGLE_CLOUD_TESTING_BRANCH="main" By doing this, you are specifying the location of the most up-to-date - version of ``python-dms``. The the suggested remote name ``upstream`` - should point to the official ``googleapis`` checkout and the - the branch should be the main branch on that remote (``main``). + version of ``python-dms``. The + remote name ``upstream`` should point to the official ``googleapis`` + checkout and the branch should be the default branch on that remote (``main``). - This repository contains configuration for the `pre-commit `__ tool, which automates checking diff --git a/docs/conf.py b/docs/conf.py index a5f4232..4464140 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,7 +76,7 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The main toctree document. +# The root toctree document. root_doc = "index" # General information about the project. From 5c21840c3b3b0f922d49b07e9ae050bb2f5aeb5d Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Tue, 7 Sep 2021 11:00:50 -0400 Subject: [PATCH 08/12] chore: revert owlbot main branch templates (#39) --- owlbot.py | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/owlbot.py b/owlbot.py index 8474134..16b1b15 100644 --- a/owlbot.py +++ b/owlbot.py @@ -47,43 +47,3 @@ s.shell.run(["nox", "-s", "blacken"], hide_output=False) -# ---------------------------------------------------------------------------- -# Main Branch migration -# ---------------------------------------------------------------------------- - -s.replace( - "*.rst", - "master", - "main" -) - -s.replace( - "README.rst", - "google-cloud-python/blob/main/README.rst", - "google-cloud-python/blob/master/README.rst" -) - -s.replace( - "CONTRIBUTING.rst", - "kubernetes/community/blob/main", - "kubernetes/community/blob/master" -) - -s.replace( - "docs/conf.py", - "master", - "main" -) - -s.replace( - "docs/conf.py", - "main_doc", - "root_doc" -) - -s.replace( - ".kokoro/*", - "master", - "main" -) - From 7f9804308bed6f9a7eeaa5222852be5c96fe4349 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Tue, 7 Sep 2021 10:46:12 -0600 Subject: [PATCH 09/12] chore: reference main branch of google-cloud-python (#40) Adjust google-cloud-python links to reference main branch. --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index c44dff3..a136230 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Python Client for Cloud Database Migration Service - `Product Documentation`_ .. |ga| image:: https://img.shields.io/badge/support-ga-gold.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#ga-support + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#ga-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-dms.svg :target: https://pypi.org/project/google-cloud-dms/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-dms.svg @@ -79,4 +79,4 @@ Next Steps APIs that we cover. .. _Cloud Database Migration Service Product documentation: https://cloud.google.com/database-migration/ -.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst \ No newline at end of file +.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst \ No newline at end of file From fea5c5899175beeced4769cf9f4f8635d51bd74b Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Tue, 21 Sep 2021 13:40:17 -0700 Subject: [PATCH 10/12] chore: relocate owl bot post processor (#42) chore: relocate owl bot post processor --- .github/.OwlBot.lock.yaml | 4 ++-- .github/.OwlBot.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index c07f148..2567653 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d + image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest + digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 399cdf7..30771bb 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -13,7 +13,7 @@ # limitations under the License. docker: - image: gcr.io/repo-automation-bots/owlbot-python:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest deep-remove-regex: - /owl-bot-staging From f82e8653bf754d4dbb5f119f23eaa97fa8faf445 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:10:54 +0000 Subject: [PATCH 11/12] chore: use gapic-generator-python 0.51.2 (#43) - [ ] Regenerate this pull request now. fix: add 'dict' annotation type to 'request' Committer: @busunkim96 PiperOrigin-RevId: 398509016 Source-Link: https://github.com/googleapis/googleapis/commit/b224dfa52642a733ea64849d4e06d15c274bc08f Source-Link: https://github.com/googleapis/googleapis-gen/commit/63a1db7a38d74b9639592f521ed1daaf7299ad9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjNhMWRiN2EzOGQ3NGI5NjM5NTkyZjUyMWVkMWRhYWY3Mjk5YWQ5YSJ9 --- .../services/data_migration_service/client.py | 70 +++++++++---------- .../data_migration_service/transports/base.py | 2 +- .../data_migration_service/transports/grpc.py | 6 +- .../transports/grpc_asyncio.py | 6 +- scripts/fixup_clouddms_v1_keywords.py | 36 +++++----- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/google/cloud/clouddms_v1/services/data_migration_service/client.py b/google/cloud/clouddms_v1/services/data_migration_service/client.py index 907dd82..18e7a3a 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/client.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -380,7 +380,7 @@ def __init__( def list_migration_jobs( self, - request: clouddms.ListMigrationJobsRequest = None, + request: Union[clouddms.ListMigrationJobsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -390,7 +390,7 @@ def list_migration_jobs( r"""Lists migration jobs in a given project and location. Args: - request (google.cloud.clouddms_v1.types.ListMigrationJobsRequest): + request (Union[google.cloud.clouddms_v1.types.ListMigrationJobsRequest, dict]): The request object. Retrieve a list of all migration jobs in a given project and location. parent (str): @@ -460,7 +460,7 @@ def list_migration_jobs( def get_migration_job( self, - request: clouddms.GetMigrationJobRequest = None, + request: Union[clouddms.GetMigrationJobRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -470,7 +470,7 @@ def get_migration_job( r"""Gets details of a single migration job. Args: - request (google.cloud.clouddms_v1.types.GetMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.GetMigrationJobRequest, dict]): The request object. Request message for 'GetMigrationJob' request. name (str): @@ -531,7 +531,7 @@ def get_migration_job( def create_migration_job( self, - request: clouddms.CreateMigrationJobRequest = None, + request: Union[clouddms.CreateMigrationJobRequest, dict] = None, *, parent: str = None, migration_job: clouddms_resources.MigrationJob = None, @@ -544,7 +544,7 @@ def create_migration_job( location. Args: - request (google.cloud.clouddms_v1.types.CreateMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.CreateMigrationJobRequest, dict]): The request object. Request message to create a new Database Migration Service migration job in the specified project and region. @@ -637,7 +637,7 @@ def create_migration_job( def update_migration_job( self, - request: clouddms.UpdateMigrationJobRequest = None, + request: Union[clouddms.UpdateMigrationJobRequest, dict] = None, *, migration_job: clouddms_resources.MigrationJob = None, update_mask: field_mask_pb2.FieldMask = None, @@ -648,7 +648,7 @@ def update_migration_job( r"""Updates the parameters of a single migration job. Args: - request (google.cloud.clouddms_v1.types.UpdateMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.UpdateMigrationJobRequest, dict]): The request object. Request message for 'UpdateMigrationJob' request. migration_job (google.cloud.clouddms_v1.types.MigrationJob): @@ -734,7 +734,7 @@ def update_migration_job( def delete_migration_job( self, - request: clouddms.DeleteMigrationJobRequest = None, + request: Union[clouddms.DeleteMigrationJobRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -744,7 +744,7 @@ def delete_migration_job( r"""Deletes a single migration job. Args: - request (google.cloud.clouddms_v1.types.DeleteMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.DeleteMigrationJobRequest, dict]): The request object. Request message for 'DeleteMigrationJob' request. name (str): @@ -826,7 +826,7 @@ def delete_migration_job( def start_migration_job( self, - request: clouddms.StartMigrationJobRequest = None, + request: Union[clouddms.StartMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -835,7 +835,7 @@ def start_migration_job( r"""Start an already created migration job. Args: - request (google.cloud.clouddms_v1.types.StartMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.StartMigrationJobRequest, dict]): The request object. Request message for 'StartMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -888,7 +888,7 @@ def start_migration_job( def stop_migration_job( self, - request: clouddms.StopMigrationJobRequest = None, + request: Union[clouddms.StopMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -897,7 +897,7 @@ def stop_migration_job( r"""Stops a running migration job. Args: - request (google.cloud.clouddms_v1.types.StopMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.StopMigrationJobRequest, dict]): The request object. Request message for 'StopMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -950,7 +950,7 @@ def stop_migration_job( def resume_migration_job( self, - request: clouddms.ResumeMigrationJobRequest = None, + request: Union[clouddms.ResumeMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -960,7 +960,7 @@ def resume_migration_job( is resumable (was stopped during CDC phase). Args: - request (google.cloud.clouddms_v1.types.ResumeMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.ResumeMigrationJobRequest, dict]): The request object. Request message for 'ResumeMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1013,7 +1013,7 @@ def resume_migration_job( def promote_migration_job( self, - request: clouddms.PromoteMigrationJobRequest = None, + request: Union[clouddms.PromoteMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1024,7 +1024,7 @@ def promote_migration_job( standalone database. Args: - request (google.cloud.clouddms_v1.types.PromoteMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.PromoteMigrationJobRequest, dict]): The request object. Request message for 'PromoteMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1077,7 +1077,7 @@ def promote_migration_job( def verify_migration_job( self, - request: clouddms.VerifyMigrationJobRequest = None, + request: Union[clouddms.VerifyMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1088,7 +1088,7 @@ def verify_migration_job( prerequisites are met. Args: - request (google.cloud.clouddms_v1.types.VerifyMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.VerifyMigrationJobRequest, dict]): The request object. Request message for 'VerifyMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1141,7 +1141,7 @@ def verify_migration_job( def restart_migration_job( self, - request: clouddms.RestartMigrationJobRequest = None, + request: Union[clouddms.RestartMigrationJobRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1152,7 +1152,7 @@ def restart_migration_job( starting the migration process from scratch. Args: - request (google.cloud.clouddms_v1.types.RestartMigrationJobRequest): + request (Union[google.cloud.clouddms_v1.types.RestartMigrationJobRequest, dict]): The request object. Request message for 'RestartMigrationJob' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1205,7 +1205,7 @@ def restart_migration_job( def generate_ssh_script( self, - request: clouddms.GenerateSshScriptRequest = None, + request: Union[clouddms.GenerateSshScriptRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1215,7 +1215,7 @@ def generate_ssh_script( reverse SSH connectivity. Args: - request (google.cloud.clouddms_v1.types.GenerateSshScriptRequest): + request (Union[google.cloud.clouddms_v1.types.GenerateSshScriptRequest, dict]): The request object. Request message for 'GenerateSshScript' request. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1258,7 +1258,7 @@ def generate_ssh_script( def list_connection_profiles( self, - request: clouddms.ListConnectionProfilesRequest = None, + request: Union[clouddms.ListConnectionProfilesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1269,7 +1269,7 @@ def list_connection_profiles( project and location. Args: - request (google.cloud.clouddms_v1.types.ListConnectionProfilesRequest): + request (Union[google.cloud.clouddms_v1.types.ListConnectionProfilesRequest, dict]): The request object. Request message for 'ListConnectionProfiles' request. parent (str): @@ -1339,7 +1339,7 @@ def list_connection_profiles( def get_connection_profile( self, - request: clouddms.GetConnectionProfileRequest = None, + request: Union[clouddms.GetConnectionProfileRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1349,7 +1349,7 @@ def get_connection_profile( r"""Gets details of a single connection profile. Args: - request (google.cloud.clouddms_v1.types.GetConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.GetConnectionProfileRequest, dict]): The request object. Request message for 'GetConnectionProfile' request. name (str): @@ -1408,7 +1408,7 @@ def get_connection_profile( def create_connection_profile( self, - request: clouddms.CreateConnectionProfileRequest = None, + request: Union[clouddms.CreateConnectionProfileRequest, dict] = None, *, parent: str = None, connection_profile: clouddms_resources.ConnectionProfile = None, @@ -1421,7 +1421,7 @@ def create_connection_profile( and location. Args: - request (google.cloud.clouddms_v1.types.CreateConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.CreateConnectionProfileRequest, dict]): The request object. Request message for 'CreateConnectionProfile' request. parent (str): @@ -1513,7 +1513,7 @@ def create_connection_profile( def update_connection_profile( self, - request: clouddms.UpdateConnectionProfileRequest = None, + request: Union[clouddms.UpdateConnectionProfileRequest, dict] = None, *, connection_profile: clouddms_resources.ConnectionProfile = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1525,7 +1525,7 @@ def update_connection_profile( profile. Args: - request (google.cloud.clouddms_v1.types.UpdateConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.UpdateConnectionProfileRequest, dict]): The request object. Request message for 'UpdateConnectionProfile' request. connection_profile (google.cloud.clouddms_v1.types.ConnectionProfile): @@ -1612,7 +1612,7 @@ def update_connection_profile( def delete_connection_profile( self, - request: clouddms.DeleteConnectionProfileRequest = None, + request: Union[clouddms.DeleteConnectionProfileRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1625,7 +1625,7 @@ def delete_connection_profile( jobs. Args: - request (google.cloud.clouddms_v1.types.DeleteConnectionProfileRequest): + request (Union[google.cloud.clouddms_v1.types.DeleteConnectionProfileRequest, dict]): The request object. Request message for 'DeleteConnectionProfile' request. name (str): diff --git a/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py b/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py index 5ce5eaa..7a2dae7 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/transports/base.py @@ -118,7 +118,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py index 4784c30..f65599c 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc.py @@ -83,16 +83,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py index 9e4229b..82ef9d2 100644 --- a/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py +++ b/google/cloud/clouddms_v1/services/data_migration_service/transports/grpc_asyncio.py @@ -130,16 +130,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/scripts/fixup_clouddms_v1_keywords.py b/scripts/fixup_clouddms_v1_keywords.py index c537a49..ff5aca3 100644 --- a/scripts/fixup_clouddms_v1_keywords.py +++ b/scripts/fixup_clouddms_v1_keywords.py @@ -39,23 +39,23 @@ def partition( class clouddmsCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_connection_profile': ('parent', 'connection_profile_id', 'connection_profile', 'request_id', ), - 'create_migration_job': ('parent', 'migration_job_id', 'migration_job', 'request_id', ), - 'delete_connection_profile': ('name', 'request_id', 'force', ), - 'delete_migration_job': ('name', 'request_id', 'force', ), - 'generate_ssh_script': ('vm', 'migration_job', 'vm_creation_config', 'vm_selection_config', 'vm_port', ), - 'get_connection_profile': ('name', ), - 'get_migration_job': ('name', ), - 'list_connection_profiles': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'list_migration_jobs': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'promote_migration_job': ('name', ), - 'restart_migration_job': ('name', ), - 'resume_migration_job': ('name', ), - 'start_migration_job': ('name', ), - 'stop_migration_job': ('name', ), - 'update_connection_profile': ('update_mask', 'connection_profile', 'request_id', ), - 'update_migration_job': ('update_mask', 'migration_job', 'request_id', ), - 'verify_migration_job': ('name', ), + 'create_connection_profile': ('parent', 'connection_profile_id', 'connection_profile', 'request_id', ), + 'create_migration_job': ('parent', 'migration_job_id', 'migration_job', 'request_id', ), + 'delete_connection_profile': ('name', 'request_id', 'force', ), + 'delete_migration_job': ('name', 'request_id', 'force', ), + 'generate_ssh_script': ('vm', 'migration_job', 'vm_creation_config', 'vm_selection_config', 'vm_port', ), + 'get_connection_profile': ('name', ), + 'get_migration_job': ('name', ), + 'list_connection_profiles': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'list_migration_jobs': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'promote_migration_job': ('name', ), + 'restart_migration_job': ('name', ), + 'resume_migration_job': ('name', ), + 'start_migration_job': ('name', ), + 'stop_migration_job': ('name', ), + 'update_connection_profile': ('update_mask', 'connection_profile', 'request_id', ), + 'update_migration_job': ('update_mask', 'migration_job', 'request_id', ), + 'verify_migration_job': ('name', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -74,7 +74,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) From a665b6ea72d78ede63d232df01e755bcb55846eb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 15:36:16 +0000 Subject: [PATCH 12/12] chore: release 1.0.1 (#44) :robot: I have created a release \*beep\* \*boop\* --- ### [1.0.1](https://www.github.com/googleapis/python-dms/compare/v1.0.0...v1.0.1) (2021-09-24) ### Bug Fixes * add 'dict' annotation type to 'request' ([f82e865](https://www.github.com/googleapis/python-dms/commit/f82e8653bf754d4dbb5f119f23eaa97fa8faf445)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be461e..534ff53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.0.1](https://www.github.com/googleapis/python-dms/compare/v1.0.0...v1.0.1) (2021-09-24) + + +### Bug Fixes + +* add 'dict' annotation type to 'request' ([f82e865](https://www.github.com/googleapis/python-dms/commit/f82e8653bf754d4dbb5f119f23eaa97fa8faf445)) + ## [1.0.0](https://www.github.com/googleapis/python-dms/compare/v0.2.2...v1.0.0) (2021-08-03) diff --git a/setup.py b/setup.py index 2c15496..060fb5b 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ name = "google-cloud-dms" description = "Cloud Database Migration Service client library" -version = "1.0.0" +version = "1.0.1" release_status = "Development Status :: 5 - Production/Stable" url = "https://github.com/googleapis/python-dms" dependencies = [