diff --git a/.coveragerc b/.coveragerc
index 810774f..0a30186 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -5,6 +5,7 @@ branch = True
show_missing = True
omit =
google/cloud/monitoring_metrics_scope/__init__.py
+ google/cloud/monitoring_metrics_scope/gapic_version.py
exclude_lines =
# Re-enable the standard pragma
pragma: NO COVER
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 889f77d..b8edda5 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
- digest: sha256:c43f1d918bcf817d337aa29ff833439494a158a0831508fda4ec75dc4c0d0320
+ digest: sha256:2e247c7bf5154df7f98cce087a20ca7605e236340c7d6d1a14447e5c06791bd6
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
index cbd7e77..ec867d9 100644
--- a/.kokoro/requirements.in
+++ b/.kokoro/requirements.in
@@ -1,10 +1,10 @@
gcp-docuploader
-gcp-releasetool
+gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x
importlib-metadata
typing-extensions
twine
wheel
setuptools
-nox
+nox>=2022.11.21 # required to remove dependency on py
charset-normalizer<3
click<8.1.0
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 05dc467..66a2172 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -1,6 +1,6 @@
#
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
#
# pip-compile --allow-unsafe --generate-hashes requirements.in
#
@@ -113,33 +113,28 @@ commonmark==0.9.1 \
--hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \
--hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9
# via rich
-cryptography==38.0.3 \
- --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \
- --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \
- --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \
- --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \
- --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \
- --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \
- --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \
- --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \
- --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \
- --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \
- --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \
- --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \
- --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \
- --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \
- --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \
- --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \
- --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \
- --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \
- --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \
- --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \
- --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \
- --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \
- --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \
- --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \
- --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \
- --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722
+cryptography==39.0.1 \
+ --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \
+ --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \
+ --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \
+ --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \
+ --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \
+ --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \
+ --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \
+ --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \
+ --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \
+ --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \
+ --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \
+ --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \
+ --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \
+ --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \
+ --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \
+ --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \
+ --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \
+ --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \
+ --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \
+ --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \
+ --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8
# via
# gcp-releasetool
# secretstorage
@@ -159,9 +154,9 @@ gcp-docuploader==0.6.4 \
--hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \
--hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf
# via -r requirements.in
-gcp-releasetool==1.10.0 \
- --hash=sha256:72a38ca91b59c24f7e699e9227c90cbe4dd71b789383cb0164b088abae294c83 \
- --hash=sha256:8c7c99320208383d4bb2b808c6880eb7a81424afe7cdba3c8d84b25f4f0e097d
+gcp-releasetool==1.10.5 \
+ --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \
+ --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9
# via -r requirements.in
google-api-core==2.10.2 \
--hash=sha256:10c06f7739fe57781f87523375e8e1a3a4674bf6392cd6131a3222182b971320 \
@@ -340,9 +335,9 @@ more-itertools==9.0.0 \
--hash=sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41 \
--hash=sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab
# via jaraco-classes
-nox==2022.8.7 \
- --hash=sha256:1b894940551dc5c389f9271d197ca5d655d40bdc6ccf93ed6880e4042760a34b \
- --hash=sha256:96cca88779e08282a699d672258ec01eb7c792d35bbbf538c723172bce23212c
+nox==2022.11.21 \
+ --hash=sha256:0e41a990e290e274cb205a976c4c97ee3c5234441a8132c8c3fd9ea3c22149eb \
+ --hash=sha256:e21c31de0711d1274ca585a2c5fde36b1aa962005ba8e9322bf5eeed16dcd684
# via -r requirements.in
packaging==21.3 \
--hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
@@ -385,10 +380,6 @@ protobuf==3.20.3 \
# gcp-docuploader
# gcp-releasetool
# google-api-core
-py==1.11.0 \
- --hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \
- --hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378
- # via nox
pyasn1==0.4.8 \
--hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \
--hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 4918b25..efe9bfb 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
{
- ".": "1.4.1"
+ ".": "1.4.2"
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba72c71..d129443 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [1.4.2](https://github.com/googleapis/python-monitoring-metrics-scopes/compare/v1.4.1...v1.4.2) (2023-03-23)
+
+
+### Documentation
+
+* Fix formatting of request arg in docstring ([#125](https://github.com/googleapis/python-monitoring-metrics-scopes/issues/125)) ([5c9463e](https://github.com/googleapis/python-monitoring-metrics-scopes/commit/5c9463e6a07f3c49dc49ba23ed7feb436781fa6b))
+
## [1.4.1](https://github.com/googleapis/python-monitoring-metrics-scopes/compare/v1.4.0...v1.4.1) (2023-01-20)
diff --git a/google/cloud/monitoring_metrics_scope/gapic_version.py b/google/cloud/monitoring_metrics_scope/gapic_version.py
index dc24d9a..f45c3f6 100644
--- a/google/cloud/monitoring_metrics_scope/gapic_version.py
+++ b/google/cloud/monitoring_metrics_scope/gapic_version.py
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-__version__ = "1.4.1" # {x-release-please-version}
+__version__ = "1.4.2" # {x-release-please-version}
diff --git a/google/cloud/monitoring_metrics_scope_v1/__init__.py b/google/cloud/monitoring_metrics_scope_v1/__init__.py
index 07e74cd..5091bb8 100644
--- a/google/cloud/monitoring_metrics_scope_v1/__init__.py
+++ b/google/cloud/monitoring_metrics_scope_v1/__init__.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-from google.cloud.monitoring_metrics_scope import gapic_version as package_version
+from google.cloud.monitoring_metrics_scope_v1 import gapic_version as package_version
__version__ = package_version.__version__
diff --git a/google/cloud/monitoring_metrics_scope_v1/gapic_version.py b/google/cloud/monitoring_metrics_scope_v1/gapic_version.py
index dc24d9a..f45c3f6 100644
--- a/google/cloud/monitoring_metrics_scope_v1/gapic_version.py
+++ b/google/cloud/monitoring_metrics_scope_v1/gapic_version.py
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-__version__ = "1.4.1" # {x-release-please-version}
+__version__ = "1.4.2" # {x-release-please-version}
diff --git a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py
index 43dcee2..bc1c00e 100644
--- a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py
+++ b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/async_client.py
@@ -265,8 +265,7 @@ async def sample_get_metrics_scope():
Args:
request (Optional[Union[google.cloud.monitoring_metrics_scope_v1.types.GetMetricsScopeRequest, dict]]):
- The request object. Request for the `GetMetricsScope`
- method.
+ The request object. Request for the ``GetMetricsScope`` method.
name (:class:`str`):
Required. The resource name of the ``Metrics Scope``.
Example:
@@ -375,8 +374,8 @@ async def sample_list_metrics_scopes_by_monitored_project():
Args:
request (Optional[Union[google.cloud.monitoring_metrics_scope_v1.types.ListMetricsScopesByMonitoredProjectRequest, dict]]):
- The request object. Request for the
- `ListMetricsScopesByMonitoredProject` method.
+ The request object. Request for the ``ListMetricsScopesByMonitoredProject``
+ method.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
@@ -458,8 +457,7 @@ async def sample_create_monitored_project():
Args:
request (Optional[Union[google.cloud.monitoring_metrics_scope_v1.types.CreateMonitoredProjectRequest, dict]]):
- The request object. Request for the
- `CreateMonitoredProject` method.
+ The request object. Request for the ``CreateMonitoredProject`` method.
parent (:class:`str`):
Required. The resource name of the existing
``Metrics Scope`` that will monitor this project.
@@ -593,8 +591,7 @@ async def sample_delete_monitored_project():
Args:
request (Optional[Union[google.cloud.monitoring_metrics_scope_v1.types.DeleteMonitoredProjectRequest, dict]]):
- The request object. Request for the
- `DeleteMonitoredProject` method.
+ The request object. Request for the ``DeleteMonitoredProject`` method.
name (:class:`str`):
Required. The resource name of the ``MonitoredProject``.
Example:
diff --git a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py
index 6969a14..fbcaeaf 100644
--- a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py
+++ b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py
@@ -499,8 +499,7 @@ def sample_get_metrics_scope():
Args:
request (Union[google.cloud.monitoring_metrics_scope_v1.types.GetMetricsScopeRequest, dict]):
- The request object. Request for the `GetMetricsScope`
- method.
+ The request object. Request for the ``GetMetricsScope`` method.
name (str):
Required. The resource name of the ``Metrics Scope``.
Example:
@@ -609,8 +608,8 @@ def sample_list_metrics_scopes_by_monitored_project():
Args:
request (Union[google.cloud.monitoring_metrics_scope_v1.types.ListMetricsScopesByMonitoredProjectRequest, dict]):
- The request object. Request for the
- `ListMetricsScopesByMonitoredProject` method.
+ The request object. Request for the ``ListMetricsScopesByMonitoredProject``
+ method.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
@@ -697,8 +696,7 @@ def sample_create_monitored_project():
Args:
request (Union[google.cloud.monitoring_metrics_scope_v1.types.CreateMonitoredProjectRequest, dict]):
- The request object. Request for the
- `CreateMonitoredProject` method.
+ The request object. Request for the ``CreateMonitoredProject`` method.
parent (str):
Required. The resource name of the existing
``Metrics Scope`` that will monitor this project.
@@ -832,8 +830,7 @@ def sample_delete_monitored_project():
Args:
request (Union[google.cloud.monitoring_metrics_scope_v1.types.DeleteMonitoredProjectRequest, dict]):
- The request object. Request for the
- `DeleteMonitoredProject` method.
+ The request object. Request for the ``DeleteMonitoredProject`` method.
name (str):
Required. The resource name of the ``MonitoredProject``.
Example:
diff --git a/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py b/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py
index cbaf8ca..e74d382 100644
--- a/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py
+++ b/google/cloud/monitoring_metrics_scope_v1/types/metrics_scope.py
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+from __future__ import annotations
+
from typing import MutableMapping, MutableSequence
from google.protobuf import timestamp_pb2 # type: ignore
diff --git a/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py b/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py
index 41dc926..107bc88 100644
--- a/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py
+++ b/google/cloud/monitoring_metrics_scope_v1/types/metrics_scopes.py
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+from __future__ import annotations
+
from typing import MutableMapping, MutableSequence
from google.protobuf import timestamp_pb2 # type: ignore
diff --git a/noxfile.py b/noxfile.py
index e716318..95e58c5 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -189,9 +189,9 @@ def unit(session):
def install_systemtest_dependencies(session, *constraints):
# Use pre-release gRPC for system tests.
- # Exclude version 1.49.0rc1 which has a known issue.
- # See https://github.com/grpc/grpc/pull/30642
- session.install("--pre", "grpcio!=1.49.0rc1")
+ # Exclude version 1.52.0rc1 which has a known issue.
+ # See https://github.com/grpc/grpc/issues/32163
+ session.install("--pre", "grpcio!=1.52.0rc1")
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints)
@@ -346,9 +346,7 @@ def prerelease_deps(session):
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
session.install(*unit_deps_all)
system_deps_all = (
- SYSTEM_TEST_STANDARD_DEPENDENCIES
- + SYSTEM_TEST_EXTERNAL_DEPENDENCIES
- + SYSTEM_TEST_EXTRAS
+ SYSTEM_TEST_STANDARD_DEPENDENCIES + SYSTEM_TEST_EXTERNAL_DEPENDENCIES
)
session.install(*system_deps_all)
@@ -378,8 +376,8 @@ def prerelease_deps(session):
# dependency of grpc
"six",
"googleapis-common-protos",
- # Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642
- "grpcio!=1.49.0rc1",
+ # Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
+ "grpcio!=1.52.0rc1",
"grpcio-status",
"google-api-core",
"proto-plus",
diff --git a/samples/generated_samples/snippet_metadata_google.monitoring.metricsscope.v1.json b/samples/generated_samples/snippet_metadata_google.monitoring.metricsscope.v1.json
index 241f11d..a919942 100644
--- a/samples/generated_samples/snippet_metadata_google.monitoring.metricsscope.v1.json
+++ b/samples/generated_samples/snippet_metadata_google.monitoring.metricsscope.v1.json
@@ -8,7 +8,7 @@
],
"language": "PYTHON",
"name": "google-cloud-monitoring-metrics-scopes",
- "version": "1.4.1"
+ "version": "1.4.2"
},
"snippets": [
{
diff --git a/setup.py b/setup.py
index 9bd49e3..8305f9d 100644
--- a/setup.py
+++ b/setup.py
@@ -57,9 +57,7 @@
if package.startswith("google")
]
-namespaces = ["google"]
-if "google.cloud" in packages:
- namespaces.append("google.cloud")
+namespaces = ["google", "google.cloud"]
setuptools.setup(
name=name,