diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ee60f7..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:aea14a583128771ae8aefa364e1652f3c56070168ef31beb203534222d842b8b + image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest + digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 3c9f3c8..8e4da3d 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 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0bf5786..4cb86af 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/CHANGELOG.md b/CHANGELOG.md index 28cea93..c81e838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-redis/#history +### [2.2.3](https://www.github.com/googleapis/python-redis/compare/v2.2.2...v2.2.3) (2021-09-24) + + +### Bug Fixes + +* add 'dict' annotation type to 'request' ([cf0a714](https://www.github.com/googleapis/python-redis/commit/cf0a71406dfa86909099fc26553f7bf74d4d23e1)) + ### [2.2.2](https://www.github.com/googleapis/python-redis/compare/v2.2.1...v2.2.2) (2021-07-28) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 8ae23e2..672d2df 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-redis # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-redis.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-redis``. 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``). + version of ``python-redis``. 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 @@ -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-redis/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-redis/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-redis @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-redis/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-redis/blob/main/noxfile.py We also explicitly decided to support Python 3 beginning with version 3.6. diff --git a/README.rst b/README.rst index cb01453..06588d1 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ Cloud Platform. - `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#general-availability + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#general-availability .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-redis.svg :target: https://pypi.org/project/google-cloud-redis/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-redis.svg diff --git a/docs/conf.py b/docs/conf.py index de6bb49..27abc47 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 root toctree document. +root_doc = "index" # General information about the project. project = "google-cloud-redis" @@ -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", @@ -279,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-redis.tex", "google-cloud-redis Documentation", author, @@ -313,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-redis", "google-cloud-redis Documentation", [author], 1,) + (root_doc, "google-cloud-redis", "google-cloud-redis Documentation", [author], 1,) ] # If true, show URL addresses after external links. @@ -327,7 +328,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-redis", "google-cloud-redis Documentation", author, diff --git a/google/cloud/redis_v1/services/cloud_redis/client.py b/google/cloud/redis_v1/services/cloud_redis/client.py index fa4f42f..11e822c 100644 --- a/google/cloud/redis_v1/services/cloud_redis/client.py +++ b/google/cloud/redis_v1/services/cloud_redis/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 @@ -376,7 +376,7 @@ def __init__( def list_instances( self, - request: cloud_redis.ListInstancesRequest = None, + request: Union[cloud_redis.ListInstancesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -395,7 +395,7 @@ def list_instances( are aggregated. Args: - request (google.cloud.redis_v1.types.ListInstancesRequest): + request (Union[google.cloud.redis_v1.types.ListInstancesRequest, dict]): The request object. Request for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances]. parent (str): @@ -467,7 +467,7 @@ def list_instances( def get_instance( self, - request: cloud_redis.GetInstanceRequest = None, + request: Union[cloud_redis.GetInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -477,7 +477,7 @@ def get_instance( r"""Gets the details of a specific Redis instance. Args: - request (google.cloud.redis_v1.types.GetInstanceRequest): + request (Union[google.cloud.redis_v1.types.GetInstanceRequest, dict]): The request object. Request for [GetInstance][google.cloud.redis.v1.CloudRedis.GetInstance]. name (str): @@ -537,7 +537,7 @@ def get_instance( def create_instance( self, - request: cloud_redis.CreateInstanceRequest = None, + request: Union[cloud_redis.CreateInstanceRequest, dict] = None, *, parent: str = None, instance_id: str = None, @@ -562,7 +562,7 @@ def create_instance( hours, so there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1.types.CreateInstanceRequest): + request (Union[google.cloud.redis_v1.types.CreateInstanceRequest, dict]): The request object. Request for [CreateInstance][google.cloud.redis.v1.CloudRedis.CreateInstance]. parent (str): @@ -659,7 +659,7 @@ def create_instance( def update_instance( self, - request: cloud_redis.UpdateInstanceRequest = None, + request: Union[cloud_redis.UpdateInstanceRequest, dict] = None, *, update_mask: field_mask_pb2.FieldMask = None, instance: cloud_redis.Instance = None, @@ -675,7 +675,7 @@ def update_instance( there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1.types.UpdateInstanceRequest): + request (Union[google.cloud.redis_v1.types.UpdateInstanceRequest, dict]): The request object. Request for [UpdateInstance][google.cloud.redis.v1.CloudRedis.UpdateInstance]. update_mask (google.protobuf.field_mask_pb2.FieldMask): @@ -765,7 +765,7 @@ def update_instance( def upgrade_instance( self, - request: cloud_redis.UpgradeInstanceRequest = None, + request: Union[cloud_redis.UpgradeInstanceRequest, dict] = None, *, name: str = None, redis_version: str = None, @@ -777,7 +777,7 @@ def upgrade_instance( specified in the request. Args: - request (google.cloud.redis_v1.types.UpgradeInstanceRequest): + request (Union[google.cloud.redis_v1.types.UpgradeInstanceRequest, dict]): The request object. Request for [UpgradeInstance][google.cloud.redis.v1.CloudRedis.UpgradeInstance]. name (str): @@ -859,7 +859,7 @@ def upgrade_instance( def import_instance( self, - request: cloud_redis.ImportInstanceRequest = None, + request: Union[cloud_redis.ImportInstanceRequest, dict] = None, *, name: str = None, input_config: cloud_redis.InputConfig = None, @@ -878,7 +878,7 @@ def import_instance( few hours, so there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1.types.ImportInstanceRequest): + request (Union[google.cloud.redis_v1.types.ImportInstanceRequest, dict]): The request object. Request for [Import][google.cloud.redis.v1.CloudRedis.ImportInstance]. name (str): @@ -960,7 +960,7 @@ def import_instance( def export_instance( self, - request: cloud_redis.ExportInstanceRequest = None, + request: Union[cloud_redis.ExportInstanceRequest, dict] = None, *, name: str = None, output_config: cloud_redis.OutputConfig = None, @@ -975,7 +975,7 @@ def export_instance( few hours, so there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1.types.ExportInstanceRequest): + request (Union[google.cloud.redis_v1.types.ExportInstanceRequest, dict]): The request object. Request for [Export][google.cloud.redis.v1.CloudRedis.ExportInstance]. name (str): @@ -1057,7 +1057,7 @@ def export_instance( def failover_instance( self, - request: cloud_redis.FailoverInstanceRequest = None, + request: Union[cloud_redis.FailoverInstanceRequest, dict] = None, *, name: str = None, data_protection_mode: cloud_redis.FailoverInstanceRequest.DataProtectionMode = None, @@ -1070,7 +1070,7 @@ def failover_instance( Memorystore for Redis instance. Args: - request (google.cloud.redis_v1.types.FailoverInstanceRequest): + request (Union[google.cloud.redis_v1.types.FailoverInstanceRequest, dict]): The request object. Request for [Failover][google.cloud.redis.v1.CloudRedis.FailoverInstance]. name (str): @@ -1153,7 +1153,7 @@ def failover_instance( def delete_instance( self, - request: cloud_redis.DeleteInstanceRequest = None, + request: Union[cloud_redis.DeleteInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1164,7 +1164,7 @@ def delete_instance( serving and data is deleted. Args: - request (google.cloud.redis_v1.types.DeleteInstanceRequest): + request (Union[google.cloud.redis_v1.types.DeleteInstanceRequest, dict]): The request object. Request for [DeleteInstance][google.cloud.redis.v1.CloudRedis.DeleteInstance]. name (str): diff --git a/google/cloud/redis_v1/services/cloud_redis/transports/base.py b/google/cloud/redis_v1/services/cloud_redis/transports/base.py index 5bcde3a..eef4bfb 100644 --- a/google/cloud/redis_v1/services/cloud_redis/transports/base.py +++ b/google/cloud/redis_v1/services/cloud_redis/transports/base.py @@ -117,7 +117,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/redis_v1/services/cloud_redis/transports/grpc.py b/google/cloud/redis_v1/services/cloud_redis/transports/grpc.py index ae03d50..3f2f306 100644 --- a/google/cloud/redis_v1/services/cloud_redis/transports/grpc.py +++ b/google/cloud/redis_v1/services/cloud_redis/transports/grpc.py @@ -102,16 +102,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/redis_v1/services/cloud_redis/transports/grpc_asyncio.py b/google/cloud/redis_v1/services/cloud_redis/transports/grpc_asyncio.py index 6108ecb..5476412 100644 --- a/google/cloud/redis_v1/services/cloud_redis/transports/grpc_asyncio.py +++ b/google/cloud/redis_v1/services/cloud_redis/transports/grpc_asyncio.py @@ -149,16 +149,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/redis_v1beta1/services/cloud_redis/client.py b/google/cloud/redis_v1beta1/services/cloud_redis/client.py index 66a1023..ea7f431 100644 --- a/google/cloud/redis_v1beta1/services/cloud_redis/client.py +++ b/google/cloud/redis_v1beta1/services/cloud_redis/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 @@ -377,7 +377,7 @@ def __init__( def list_instances( self, - request: cloud_redis.ListInstancesRequest = None, + request: Union[cloud_redis.ListInstancesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -396,7 +396,7 @@ def list_instances( are aggregated. Args: - request (google.cloud.redis_v1beta1.types.ListInstancesRequest): + request (Union[google.cloud.redis_v1beta1.types.ListInstancesRequest, dict]): The request object. Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances]. parent (str): @@ -468,7 +468,7 @@ def list_instances( def get_instance( self, - request: cloud_redis.GetInstanceRequest = None, + request: Union[cloud_redis.GetInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -478,7 +478,7 @@ def get_instance( r"""Gets the details of a specific Redis instance. Args: - request (google.cloud.redis_v1beta1.types.GetInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.GetInstanceRequest, dict]): The request object. Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance]. name (str): @@ -538,7 +538,7 @@ def get_instance( def create_instance( self, - request: cloud_redis.CreateInstanceRequest = None, + request: Union[cloud_redis.CreateInstanceRequest, dict] = None, *, parent: str = None, instance_id: str = None, @@ -563,7 +563,7 @@ def create_instance( hours, so there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1beta1.types.CreateInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.CreateInstanceRequest, dict]): The request object. Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance]. parent (str): @@ -660,7 +660,7 @@ def create_instance( def update_instance( self, - request: cloud_redis.UpdateInstanceRequest = None, + request: Union[cloud_redis.UpdateInstanceRequest, dict] = None, *, update_mask: field_mask_pb2.FieldMask = None, instance: cloud_redis.Instance = None, @@ -676,7 +676,7 @@ def update_instance( there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1beta1.types.UpdateInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.UpdateInstanceRequest, dict]): The request object. Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance]. update_mask (google.protobuf.field_mask_pb2.FieldMask): @@ -766,7 +766,7 @@ def update_instance( def upgrade_instance( self, - request: cloud_redis.UpgradeInstanceRequest = None, + request: Union[cloud_redis.UpgradeInstanceRequest, dict] = None, *, name: str = None, redis_version: str = None, @@ -778,7 +778,7 @@ def upgrade_instance( specified in the request. Args: - request (google.cloud.redis_v1beta1.types.UpgradeInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.UpgradeInstanceRequest, dict]): The request object. Request for [UpgradeInstance][google.cloud.redis.v1beta1.CloudRedis.UpgradeInstance]. name (str): @@ -860,7 +860,7 @@ def upgrade_instance( def import_instance( self, - request: cloud_redis.ImportInstanceRequest = None, + request: Union[cloud_redis.ImportInstanceRequest, dict] = None, *, name: str = None, input_config: cloud_redis.InputConfig = None, @@ -879,7 +879,7 @@ def import_instance( few hours, so there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1beta1.types.ImportInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.ImportInstanceRequest, dict]): The request object. Request for [Import][google.cloud.redis.v1beta1.CloudRedis.ImportInstance]. name (str): @@ -961,7 +961,7 @@ def import_instance( def export_instance( self, - request: cloud_redis.ExportInstanceRequest = None, + request: Union[cloud_redis.ExportInstanceRequest, dict] = None, *, name: str = None, output_config: cloud_redis.OutputConfig = None, @@ -976,7 +976,7 @@ def export_instance( few hours, so there is no need to call DeleteOperation. Args: - request (google.cloud.redis_v1beta1.types.ExportInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.ExportInstanceRequest, dict]): The request object. Request for [Export][google.cloud.redis.v1beta1.CloudRedis.ExportInstance]. name (str): @@ -1058,7 +1058,7 @@ def export_instance( def failover_instance( self, - request: cloud_redis.FailoverInstanceRequest = None, + request: Union[cloud_redis.FailoverInstanceRequest, dict] = None, *, name: str = None, data_protection_mode: cloud_redis.FailoverInstanceRequest.DataProtectionMode = None, @@ -1071,7 +1071,7 @@ def failover_instance( Memorystore for Redis instance. Args: - request (google.cloud.redis_v1beta1.types.FailoverInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.FailoverInstanceRequest, dict]): The request object. Request for [Failover][google.cloud.redis.v1beta1.CloudRedis.FailoverInstance]. name (str): @@ -1154,7 +1154,7 @@ def failover_instance( def delete_instance( self, - request: cloud_redis.DeleteInstanceRequest = None, + request: Union[cloud_redis.DeleteInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1165,7 +1165,7 @@ def delete_instance( serving and data is deleted. Args: - request (google.cloud.redis_v1beta1.types.DeleteInstanceRequest): + request (Union[google.cloud.redis_v1beta1.types.DeleteInstanceRequest, dict]): The request object. Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance]. name (str): diff --git a/google/cloud/redis_v1beta1/services/cloud_redis/transports/base.py b/google/cloud/redis_v1beta1/services/cloud_redis/transports/base.py index 5b58f51..9f93444 100644 --- a/google/cloud/redis_v1beta1/services/cloud_redis/transports/base.py +++ b/google/cloud/redis_v1beta1/services/cloud_redis/transports/base.py @@ -117,7 +117,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/redis_v1beta1/services/cloud_redis/transports/grpc.py b/google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc.py index 590db8f..69e54ca 100644 --- a/google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc.py +++ b/google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc.py @@ -102,16 +102,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/redis_v1beta1/services/cloud_redis/transports/grpc_asyncio.py b/google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc_asyncio.py index 764457c..44521b1 100644 --- a/google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc_asyncio.py +++ b/google/cloud/redis_v1beta1/services/cloud_redis/transports/grpc_asyncio.py @@ -149,16 +149,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/noxfile.py b/noxfile.py index 03aa2f5..2bf3ffd 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/owlbot.py b/owlbot.py index 4cefc3b..67b8f34 100644 --- a/owlbot.py +++ b/owlbot.py @@ -16,6 +16,7 @@ import synthtool as s import synthtool.gcp as gcp +from synthtool.languages import python import logging logging.basicConfig(level=logging.DEBUG) @@ -40,4 +41,6 @@ ) s.move(templated_files, excludes=[".coveragerc"]) # microgenerator has a good .coveragerc file +python.py_samples(skip_readmes=True) + s.shell.run(["nox", "-s", "blacken"], hide_output=False) diff --git a/renovate.json b/renovate.json index c048955..c21036d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,9 @@ { "extends": [ - "config:base", ":preserveSemverRanges" + "config:base", + "group:all", + ":preserveSemverRanges", + ":disableDependencyDashboard" ], "ignorePaths": [".pre-commit-config.yaml"], "pip_requirements": { diff --git a/scripts/fixup_redis_v1_keywords.py b/scripts/fixup_redis_v1_keywords.py index 876e658..a8415f0 100644 --- a/scripts/fixup_redis_v1_keywords.py +++ b/scripts/fixup_redis_v1_keywords.py @@ -39,15 +39,15 @@ def partition( class redisCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_instance': ('parent', 'instance_id', 'instance', ), - 'delete_instance': ('name', ), - 'export_instance': ('name', 'output_config', ), - 'failover_instance': ('name', 'data_protection_mode', ), - 'get_instance': ('name', ), - 'import_instance': ('name', 'input_config', ), - 'list_instances': ('parent', 'page_size', 'page_token', ), - 'update_instance': ('update_mask', 'instance', ), - 'upgrade_instance': ('name', 'redis_version', ), + 'create_instance': ('parent', 'instance_id', 'instance', ), + 'delete_instance': ('name', ), + 'export_instance': ('name', 'output_config', ), + 'failover_instance': ('name', 'data_protection_mode', ), + 'get_instance': ('name', ), + 'import_instance': ('name', 'input_config', ), + 'list_instances': ('parent', 'page_size', 'page_token', ), + 'update_instance': ('update_mask', 'instance', ), + 'upgrade_instance': ('name', 'redis_version', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -66,7 +66,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 ) diff --git a/scripts/fixup_redis_v1beta1_keywords.py b/scripts/fixup_redis_v1beta1_keywords.py index 876e658..a8415f0 100644 --- a/scripts/fixup_redis_v1beta1_keywords.py +++ b/scripts/fixup_redis_v1beta1_keywords.py @@ -39,15 +39,15 @@ def partition( class redisCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_instance': ('parent', 'instance_id', 'instance', ), - 'delete_instance': ('name', ), - 'export_instance': ('name', 'output_config', ), - 'failover_instance': ('name', 'data_protection_mode', ), - 'get_instance': ('name', ), - 'import_instance': ('name', 'input_config', ), - 'list_instances': ('parent', 'page_size', 'page_token', ), - 'update_instance': ('update_mask', 'instance', ), - 'upgrade_instance': ('name', 'redis_version', ), + 'create_instance': ('parent', 'instance_id', 'instance', ), + 'delete_instance': ('name', ), + 'export_instance': ('name', 'output_config', ), + 'failover_instance': ('name', 'data_protection_mode', ), + 'get_instance': ('name', ), + 'import_instance': ('name', 'input_config', ), + 'list_instances': ('parent', 'page_size', 'page_token', ), + 'update_instance': ('update_mask', 'instance', ), + 'upgrade_instance': ('name', 'redis_version', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -66,7 +66,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 ) 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 diff --git a/setup.py b/setup.py index 8fdfb61..4329023 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ name = "google-cloud-redis" description = "Google Cloud Memorystore for Redis API client library" -version = "2.2.2" +version = "2.2.3" # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta'