diff --git a/.coveragerc b/.coveragerc index b178b09..dd39c85 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,3 +1,19 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2020 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 +# +# https://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. + # Generated by synthtool. DO NOT EDIT! [run] branch = True diff --git a/.flake8 b/.flake8 index 0268ecc..20fe9bd 100644 --- a/.flake8 +++ b/.flake8 @@ -1,3 +1,19 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2020 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 +# +# https://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. + # Generated by synthtool. DO NOT EDIT! [flake8] ignore = E203, E266, E501, W503 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 053db3f..af1a354 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,8 +11,7 @@ Thanks for stopping by to let us know something could be better! Please run down the following list and make sure you've tried the usual "quick fixes": - Search the issues already opened: https://github.com/googleapis/python-redis/issues - - Search the issues on our "catch-all" repository: https://github.com/googleapis/google-cloud-python - - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+python + - Search StackOverflow: https://stackoverflow.com/questions/tagged/google-cloud-platform+python If you are still having issues, please be sure to include as much information as possible: diff --git a/.repo-metadata.json b/.repo-metadata.json index 02f70a4..7262124 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -4,7 +4,7 @@ "product_documentation": "https://cloud.google.com/memorystore/docs/redis/", "client_documentation": "https://googleapis.dev/python/redis/latest", "issue_tracker": "https://issuetracker.google.com/savedsearches/5169231", - "release_level": "alpha", + "release_level": "ga", "language": "python", "repo": "googleapis/python-redis", "distribution_name": "google-cloud-redis", diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fd622c..f55540a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-redis/#history +## [1.0.0](https://www.github.com/googleapis/python-redis/compare/v0.4.0...v1.0.0) (2020-05-12) + + +### Features + +* set release_status to production/stable ([#11](https://www.github.com/googleapis/python-redis/issues/11)) ([effc368](https://www.github.com/googleapis/python-redis/commit/effc368f6904cb6321ec9a8100460a0df36132ab)) + ## [0.4.0](https://www.github.com/googleapis/python-redis/compare/v0.3.0...v0.4.0) (2020-02-12) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 5432b6b..413b921 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -22,7 +22,7 @@ In order to add a feature: documentation. - The feature must work fully on the following CPython versions: 2.7, - 3.5, 3.6, and 3.7 on both UNIX and Windows. + 3.5, 3.6, 3.7 and 3.8 on both UNIX and Windows. - The feature must not add unnecessary dependencies (where "unnecessary" is of course subjective, but new dependencies should @@ -214,26 +214,18 @@ We support: - `Python 3.5`_ - `Python 3.6`_ - `Python 3.7`_ +- `Python 3.8`_ .. _Python 3.5: https://docs.python.org/3.5/ .. _Python 3.6: https://docs.python.org/3.6/ .. _Python 3.7: https://docs.python.org/3.7/ +.. _Python 3.8: https://docs.python.org/3.8/ Supported versions can be found in our ``noxfile.py`` `config`_. .. _config: https://github.com/googleapis/python-redis/blob/master/noxfile.py -We explicitly decided not to support `Python 2.5`_ due to `decreased usage`_ -and lack of continuous integration `support`_. - -.. _Python 2.5: https://docs.python.org/2.5/ -.. _decreased usage: https://caremad.io/2013/10/a-look-at-pypi-downloads/ -.. _support: https://blog.travis-ci.com/2013-11-18-upcoming-build-environment-updates/ - -We have `dropped 2.6`_ as a supported version as well since Python 2.6 is no -longer supported by the core development team. - Python 2.7 support is deprecated. All code changes should maintain Python 2.7 compatibility until January 1, 2020. We also explicitly decided to support Python 3 beginning with version @@ -247,7 +239,6 @@ We also explicitly decided to support Python 3 beginning with version .. _prominent: https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django .. _projects: http://flask.pocoo.org/docs/0.10/python3/ .. _Unicode literal support: https://www.python.org/dev/peps/pep-0414/ -.. _dropped 2.6: https://github.com/googleapis/google-cloud-python/issues/995 ********** Versioning diff --git a/MANIFEST.in b/MANIFEST.in index cd011be..68855ab 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,19 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2020 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 +# +# https://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. + # Generated by synthtool. DO NOT EDIT! include README.rst LICENSE recursive-include google *.json *.proto diff --git a/README.rst b/README.rst index e66a871..c8f29b7 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Python Client for Google Cloud Memorystore for Redis API ======================================================== -|alpha| |pypi| |versions| +|ga| |pypi| |versions| `Google Cloud Memorystore for Redis API`_: The Google Cloud Memorystore for Redis API is used for creating and managing Redis instances on the Google @@ -10,8 +10,8 @@ Cloud Platform. - `Client Library Documentation`_ - `Product Documentation`_ -.. |alpha| image:: https://img.shields.io/badge/support-alpha-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#alpha-support +.. |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 .. |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/google/cloud/redis_v1/proto/cloud_redis.proto b/google/cloud/redis_v1/proto/cloud_redis.proto index c16ceb6..1b46694 100644 --- a/google/cloud/redis_v1/proto/cloud_redis.proto +++ b/google/cloud/redis_v1/proto/cloud_redis.proto @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC. +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,7 +11,6 @@ // 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. -// syntax = "proto3"; @@ -277,8 +276,9 @@ message Instance { // If not provided, latest supported version will be used. Currently, the // supported values are: // - // * `REDIS_4_0` for Redis 4.0 compatibility (default) // * `REDIS_3_2` for Redis 3.2 compatibility + // * `REDIS_4_0` for Redis 4.0 compatibility (default) + // * `REDIS_5_0` for Redis 5.0 compatibility string redis_version = 7 [(google.api.field_behavior) = OPTIONAL]; // Optional. The CIDR range of internal addresses that are reserved for this @@ -315,16 +315,22 @@ message Instance { // http://redis.io/topics/config. Currently, the only supported parameters // are: // - // Redis 3.2 and above: + // Redis version 3.2 and newer: // // * maxmemory-policy // * notify-keyspace-events // - // Redis 4.0 and above: + // Redis version 4.0 and newer: // // * activedefrag - // * lfu-log-factor // * lfu-decay-time + // * lfu-log-factor + // * maxmemory-gb + // + // Redis version 5.0 and newer: + // + // * stream-node-max-bytes + // * stream-node-max-entries map redis_configs = 16 [(google.api.field_behavior) = OPTIONAL]; // Required. The service tier of the instance. diff --git a/google/cloud/redis_v1/proto/cloud_redis_pb2.py b/google/cloud/redis_v1/proto/cloud_redis_pb2.py index 411880c..d7657f3 100644 --- a/google/cloud/redis_v1/proto/cloud_redis_pb2.py +++ b/google/cloud/redis_v1/proto/cloud_redis_pb2.py @@ -1734,8 +1734,6 @@ DESCRIPTOR=_INSTANCE, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""A Google Cloud Redis instance. - - Attributes: name: Required. Unique name of the resource in this scope including @@ -1769,9 +1767,9 @@ redis_version: Optional. The version of Redis software. If not provided, latest supported version will be used. Currently, the - supported values are: - ``REDIS_4_0`` for Redis 4.0 - compatibility (default) - ``REDIS_3_2`` for Redis 3.2 - compatibility + supported values are: - ``REDIS_3_2`` for Redis 3.2 + compatibility - ``REDIS_4_0`` for Redis 4.0 compatibility + (default) - ``REDIS_5_0`` for Redis 5.0 compatibility reserved_ip_range: Optional. The CIDR range of internal addresses that are reserved for this instance. If not provided, the service will @@ -1803,9 +1801,11 @@ redis_configs: Optional. Redis configuration parameters, according to http://redis.io/topics/config. Currently, the only supported - parameters are: Redis 3.2 and above: - maxmemory-policy - - notify-keyspace-events Redis 4.0 and above: - activedefrag - - lfu-log-factor - lfu-decay-time + parameters are: Redis version 3.2 and newer: - maxmemory- + policy - notify-keyspace-events Redis version 4.0 and newer: + - activedefrag - lfu-decay-time - lfu-log-factor - + maxmemory-gb Redis version 5.0 and newer: - stream-node- + max-bytes - stream-node-max-entries tier: Required. The service tier of the instance. memory_size_gb: @@ -1840,8 +1840,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Request for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances]. - - Attributes: parent: Required. The resource name of the instance location using the @@ -1873,8 +1871,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Response for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances]. - - Attributes: instances: A list of Redis instances in the project in the specified @@ -1906,8 +1902,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Request for [GetInstance][google.cloud.redis.v1.CloudRedis.GetInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -1927,8 +1921,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Request for [CreateInstance][google.cloud.redis.v1.CloudRedis.CreateInstance]. - - Attributes: parent: Required. The resource name of the instance location using the @@ -1957,8 +1949,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Request for [UpdateInstance][google.cloud.redis.v1.CloudRedis.UpdateInstance]. - - Attributes: update_mask: Required. Mask of fields to update. At least one path must be @@ -1984,8 +1974,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Request for [DeleteInstance][google.cloud.redis.v1.CloudRedis.DeleteInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -2004,8 +1992,6 @@ DESCRIPTOR=_GCSSOURCE, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""The Cloud Storage location for the input content - - Attributes: uri: Required. Source data URI. (e.g. @@ -2023,8 +2009,6 @@ DESCRIPTOR=_INPUTCONFIG, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""The input content - - Attributes: source: Required. Specify source location of input data @@ -2042,10 +2026,7 @@ dict( DESCRIPTOR=_IMPORTINSTANCEREQUEST, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", - __doc__="""Request for - [Import][google.cloud.redis.v1.CloudRedis.ImportInstance]. - - + __doc__="""Request for [Import][google.cloud.redis.v1.CloudRedis.ImportInstance]. Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -2066,8 +2047,6 @@ DESCRIPTOR=_GCSDESTINATION, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""The Cloud Storage location for the output content - - Attributes: uri: Required. Data destination URI (e.g. @@ -2086,8 +2065,6 @@ DESCRIPTOR=_OUTPUTCONFIG, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""The output content - - Attributes: destination: Required. Specify destination location of output data @@ -2105,10 +2082,7 @@ dict( DESCRIPTOR=_EXPORTINSTANCEREQUEST, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", - __doc__="""Request for - [Export][google.cloud.redis.v1.CloudRedis.ExportInstance]. - - + __doc__="""Request for [Export][google.cloud.redis.v1.CloudRedis.ExportInstance]. Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -2130,8 +2104,6 @@ __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Request for [Failover][google.cloud.redis.v1.CloudRedis.FailoverInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -2154,8 +2126,6 @@ DESCRIPTOR=_OPERATIONMETADATA, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", __doc__="""Represents the v1 metadata of the long-running operation. - - Attributes: create_time: Creation timestamp. @@ -2192,12 +2162,10 @@ ), DESCRIPTOR=_LOCATIONMETADATA, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", - __doc__="""This location metadata represents additional configuration - options for a given location where a Redis instance may be created. All - fields are output only. It is returned as content of the + __doc__="""This location metadata represents additional configuration options for + a given location where a Redis instance may be created. All fields are + output only. It is returned as content of the ``google.cloud.location.Location.metadata`` field. - - Attributes: available_zones: Output only. The set of available zones in the location. The @@ -2218,9 +2186,8 @@ dict( DESCRIPTOR=_ZONEMETADATA, __module__="google.cloud.redis_v1.proto.cloud_redis_pb2", - __doc__="""Defines specific information for a particular zone. - Currently empty and reserved for future use only. - """, + __doc__="""Defines specific information for a particular zone. Currently empty + and reserved for future use only.""", # @@protoc_insertion_point(class_scope:google.cloud.redis.v1.ZoneMetadata) ), ) diff --git a/google/cloud/redis_v1beta1/proto/cloud_redis.proto b/google/cloud/redis_v1beta1/proto/cloud_redis.proto index 968523f..47d9a6f 100644 --- a/google/cloud/redis_v1beta1/proto/cloud_redis.proto +++ b/google/cloud/redis_v1beta1/proto/cloud_redis.proto @@ -1,4 +1,4 @@ -// Copyright 2019 Google LLC. +// Copyright 2020 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,7 +11,6 @@ // 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. -// syntax = "proto3"; @@ -291,8 +290,9 @@ message Instance { // If not provided, latest supported version will be used. Currently, the // supported values are: // - // * `REDIS_4_0` for Redis 4.0 compatibility (default) // * `REDIS_3_2` for Redis 3.2 compatibility + // * `REDIS_4_0` for Redis 4.0 compatibility (default) + // * `REDIS_5_0` for Redis 5.0 compatibility string redis_version = 7 [(google.api.field_behavior) = OPTIONAL]; // Optional. The CIDR range of internal addresses that are reserved for this @@ -329,16 +329,22 @@ message Instance { // http://redis.io/topics/config. Currently, the only supported parameters // are: // - // Redis 3.2 and above: + // Redis version 3.2 and newer: // // * maxmemory-policy // * notify-keyspace-events // - // Redis 4.0 and above: + // Redis version 4.0 and newer: // // * activedefrag - // * lfu-log-factor // * lfu-decay-time + // * lfu-log-factor + // * maxmemory-gb + // + // Redis version 5.0 and newer: + // + // * stream-node-max-bytes + // * stream-node-max-entries map redis_configs = 16 [(google.api.field_behavior) = OPTIONAL]; // Required. The service tier of the instance. diff --git a/google/cloud/redis_v1beta1/proto/cloud_redis_pb2.py b/google/cloud/redis_v1beta1/proto/cloud_redis_pb2.py index 96fe440..c3f7861 100644 --- a/google/cloud/redis_v1beta1/proto/cloud_redis_pb2.py +++ b/google/cloud/redis_v1beta1/proto/cloud_redis_pb2.py @@ -1640,8 +1640,6 @@ DESCRIPTOR=_INSTANCE, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""A Google Cloud Redis instance. - - Attributes: name: Required. Unique name of the resource in this scope including @@ -1675,9 +1673,9 @@ redis_version: Optional. The version of Redis software. If not provided, latest supported version will be used. Currently, the - supported values are: - ``REDIS_4_0`` for Redis 4.0 - compatibility (default) - ``REDIS_3_2`` for Redis 3.2 - compatibility + supported values are: - ``REDIS_3_2`` for Redis 3.2 + compatibility - ``REDIS_4_0`` for Redis 4.0 compatibility + (default) - ``REDIS_5_0`` for Redis 5.0 compatibility reserved_ip_range: Optional. The CIDR range of internal addresses that are reserved for this instance. If not provided, the service will @@ -1708,9 +1706,11 @@ redis_configs: Optional. Redis configuration parameters, according to http://redis.io/topics/config. Currently, the only supported - parameters are: Redis 3.2 and above: - maxmemory-policy - - notify-keyspace-events Redis 4.0 and above: - activedefrag - - lfu-log-factor - lfu-decay-time + parameters are: Redis version 3.2 and newer: - maxmemory- + policy - notify-keyspace-events Redis version 4.0 and newer: + - activedefrag - lfu-decay-time - lfu-log-factor - + maxmemory-gb Redis version 5.0 and newer: - stream-node- + max-bytes - stream-node-max-entries tier: Required. The service tier of the instance. memory_size_gb: @@ -1745,8 +1745,6 @@ __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances]. - - Attributes: parent: Required. The resource name of the instance location using the @@ -1778,8 +1776,6 @@ __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""Response for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances]. - - Attributes: instances: A list of Redis instances in the project in the specified @@ -1811,8 +1807,6 @@ __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -1830,10 +1824,8 @@ dict( DESCRIPTOR=_CREATEINSTANCEREQUEST, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", - __doc__="""Request for - [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance]. - - + __doc__="""Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.Cre + ateInstance]. Attributes: parent: Required. The resource name of the instance location using the @@ -1860,10 +1852,8 @@ dict( DESCRIPTOR=_UPDATEINSTANCEREQUEST, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", - __doc__="""Request for - [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance]. - - + __doc__="""Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.Upd + ateInstance]. Attributes: update_mask: Required. Mask of fields to update. At least one path must be @@ -1887,10 +1877,8 @@ dict( DESCRIPTOR=_UPGRADEINSTANCEREQUEST, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", - __doc__="""Request for - [UpgradeInstance][google.cloud.redis.v1beta1.CloudRedis.UpgradeInstance]. - - + __doc__="""Request for [UpgradeInstance][google.cloud.redis.v1beta1.CloudRedis.Up + gradeInstance]. Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -1911,10 +1899,8 @@ dict( DESCRIPTOR=_DELETEINSTANCEREQUEST, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", - __doc__="""Request for - [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance]. - - + __doc__="""Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.Del + eteInstance]. Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -1933,8 +1919,6 @@ DESCRIPTOR=_GCSSOURCE, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""The Cloud Storage location for the input content - - Attributes: uri: Required. Source data URI. (e.g. @@ -1952,8 +1936,6 @@ DESCRIPTOR=_INPUTCONFIG, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""The input content - - Attributes: source: Required. Specify source location of input data @@ -1973,8 +1955,6 @@ __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""Request for [Import][google.cloud.redis.v1beta1.CloudRedis.ImportInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -1995,8 +1975,6 @@ DESCRIPTOR=_GCSDESTINATION, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""The Cloud Storage location for the output content - - Attributes: uri: Required. Data destination URI (e.g. @@ -2015,8 +1993,6 @@ DESCRIPTOR=_OUTPUTCONFIG, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""The output content - - Attributes: destination: Required. Specify destination location of output data @@ -2036,8 +2012,6 @@ __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""Request for [Export][google.cloud.redis.v1beta1.CloudRedis.ExportInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -2059,8 +2033,6 @@ __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", __doc__="""Request for [Failover][google.cloud.redis.v1beta1.CloudRedis.FailoverInstance]. - - Attributes: name: Required. Redis instance resource name using the form: ``proje @@ -2091,12 +2063,10 @@ ), DESCRIPTOR=_LOCATIONMETADATA, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", - __doc__="""This location metadata represents additional configuration - options for a given location where a Redis instance may be created. All - fields are output only. It is returned as content of the + __doc__="""This location metadata represents additional configuration options for + a given location where a Redis instance may be created. All fields are + output only. It is returned as content of the ``google.cloud.location.Location.metadata`` field. - - Attributes: available_zones: Output only. The set of available zones in the location. The @@ -2117,10 +2087,8 @@ dict( DESCRIPTOR=_ZONEMETADATA, __module__="google.cloud.redis_v1beta1.proto.cloud_redis_pb2", - __doc__="""Defines specific information for a particular zone. - Currently empty and reserved for future use only. - - """, + __doc__="""Defines specific information for a particular zone. Currently empty + and reserved for future use only.""", # @@protoc_insertion_point(class_scope:google.cloud.redis.v1beta1.ZoneMetadata) ), ) diff --git a/noxfile.py b/noxfile.py index 2bfc4d7..c454782 100644 --- a/noxfile.py +++ b/noxfile.py @@ -110,8 +110,7 @@ def system(session): # Install all test dependencies, then install this package into the # virtualenv's dist-packages. - session.install("mock", "pytest") - + session.install("mock", "pytest", "google-cloud-testutils") session.install("-e", ".") # Run py.test against the system tests. @@ -139,7 +138,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( diff --git a/setup.cfg b/setup.cfg index 3bd5555..c3a2b39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,19 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2020 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 +# +# https://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. + # Generated by synthtool. DO NOT EDIT! [bdist_wheel] universal = 1 diff --git a/setup.py b/setup.py index be6b6c6..9b93ab1 100644 --- a/setup.py +++ b/setup.py @@ -22,12 +22,12 @@ name = "google-cloud-redis" description = "Google Cloud Memorystore for Redis API client library" -version = "0.4.0" +version = "1.0.0" # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' # 'Development Status :: 5 - Production/Stable' -release_status = "Development Status :: 3 - Alpha" +release_status = "Development Status :: 5 - Production/Stable" dependencies = [ "google-api-core[grpc] >= 1.14.0, < 2.0.0dev", 'enum34; python_version < "3.4"', diff --git a/synth.metadata b/synth.metadata index d8f9c34..2b6877c 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,41 +1,32 @@ { - "updateTime": "2020-02-12T21:01:23.468961Z", "sources": [ { - "git": { - "name": ".", - "remote": "git@github.com:googleapis/python-redis.git", - "sha": "53d302baa0e1357d1f3dc9fc9ca74db145ecf78e" + "generator": { + "name": "artman", + "version": "2.0.0", + "dockerImage": "googleapis/artman@sha256:b3b47805231a305d0f40c4bf069df20f6a2635574e6d4259fac651d3f9f6e098" } }, { "git": { - "name": "synthtool", - "remote": "git@github.com:GoogleCloudPlatform/synthtool.git", - "sha": "e7660b704f319e2c1ea45d421b86b008d48ae37e" - } - }, - { - "generator": { - "name": "artman", - "version": "0.45.0", - "dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b" + "name": ".", + "remote": "git@github.com:googleapis/python-redis", + "sha": "276103ea988bff390f6835843c9665b97e671e11" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "2c17ac33b226194041155bb5340c3f34733f1b3a", - "internalRef": "294734008", - "log": "2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\n" + "sha": "756b174de4a122461993c1c583345533d819936d", + "internalRef": "308824110" } }, { - "template": { - "name": "python_split_library", - "origin": "synthtool.gcp", - "version": "2020.2.4" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "01b6f23d24b27878b48667ce597876d66b59780e" } } ], diff --git a/synth.py b/synth.py index 51db376..ab8f163 100644 --- a/synth.py +++ b/synth.py @@ -20,7 +20,7 @@ logging.basicConfig(level=logging.DEBUG) -gapic = gcp.GAPICGenerator() +gapic = gcp.GAPICBazel() common = gcp.CommonTemplates() excludes = ["README.rst", "setup.py", "nox*.py", "docs/conf.py", "docs/index.rst"] @@ -29,9 +29,9 @@ # ---------------------------------------------------------------------------- for version in ["v1beta1", "v1"]: library = gapic.py_library( - "redis", - version, - config_path=f"artman_redis_{version}.yaml", + service="redis", + version=version, + bazel_target=f"//google/cloud/redis/{version}:redis-{version}-py", include_protos=True, )