googleapis · Jul 14, 2022 · Jul 26, 2022 · Jul 26, 2022 · Aug 9, 2022 · Aug 11, 2022
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:e7bb19d47c13839fe8c147e50e02e8b6cf5da8edd1af8b82208cd6f66cc2829c
-# created: 2022-07-05T18:31:20.838186805Z
+  digest: sha256:c6c965a4bf40c19011b11f87dbc801a66d3a23fbc6704102be064ef31c51f1c3
+# created: 2022-08-09T15:58:56.463048506Z
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: "3.10"
     - name: Install nox
@@ -26,7 +26,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: "3.10"
     - name: Install nox

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: "3.10"
     - name: Install nox

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
     - name: Install nox
@@ -39,7 +39,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: "3.10"
     - name: Install coverage

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.2.2](https://github.com/googleapis/python-monitoring-metrics-scopes/compare/v1.2.1...v1.2.2) (2022-08-11)
+
+
+### Bug Fixes
+
+* **deps:** allow protobuf < 5.0.0 ([#88](https://github.com/googleapis/python-monitoring-metrics-scopes/issues/88)) ([8cdc319](https://github.com/googleapis/python-monitoring-metrics-scopes/commit/8cdc3191c56e84ee28e87dd22f0354ab9c6ca4e7))
+* **deps:** require proto-plus >= 1.22.0 ([8cdc319](https://github.com/googleapis/python-monitoring-metrics-scopes/commit/8cdc3191c56e84ee28e87dd22f0354ab9c6ca4e7))
+
 ## [1.2.1](https://github.com/googleapis/python-monitoring-metrics-scopes/compare/v1.2.0...v1.2.1) (2022-07-13)
 
 

diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ Python Client for Metrics Scopes API
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-monitoring-metrics-scopes.svg
    :target: https://pypi.org/project/google-cloud-monitoring-metrics-scopes/
 .. _Metrics Scopes API: https://cloud.google.com/monitoring/docs
-.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/monitoring/latest
+.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/google-cloud-monitoring-metrics-scopes/latest
 .. _Product Documentation:  https://cloud.google.com/monitoring/docs
 
 Quick Start
@@ -55,18 +55,22 @@ Code samples and snippets live in the `samples/` folder.
 
 Supported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^
-Our client libraries are compatible with all current [active](https://devguide.python.org/devcycle/#in-development-main-branch) and [maintenance](https://devguide.python.org/devcycle/#maintenance-branches) versions of
+Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
 Python >= 3.7
 
+.. _active: https://devguide.python.org/devcycle/#in-development-main-branch
+.. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
+
 Unsupported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Python <= 3.6
 
-If you are using an [end-of-life](https://devguide.python.org/devcycle/#end-of-life-branches)
+If you are using an `end-of-life`_
 version of Python, we recommend that you update as soon as possible to an actively supported version.
 
+.. _end-of-life: https://devguide.python.org/devcycle/#end-of-life-branches
 
 Mac/Linux
 ^^^^^^^^^

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
@@ -586,9 +586,6 @@ async def sample_delete_monitored_project():
 
                       }
 
-                   The JSON representation for Empty is empty JSON
-                   object {}.
-
         """
         # Create or coerce a protobuf request object.
         # Quick check: If we got a request object, we should *not* have

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
@@ -823,9 +823,6 @@ def sample_delete_monitored_project():
 
                       }
 
-                   The JSON representation for Empty is empty JSON
-                   object {}.
-
         """
         # Create or coerce a protobuf request object.
         # Quick check: If we got a request object, we should *not* have

diff --git a/noxfile.py b/noxfile.py
@@ -334,7 +334,8 @@ def prerelease_deps(session):
 
     # Install all dependencies
     session.install("-e", ".[all, tests, tracing]")
-    session.install(*UNIT_TEST_STANDARD_DEPENDENCIES)
+    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
@@ -363,12 +364,6 @@ def prerelease_deps(session):
 
     session.install(*constraints_deps)
 
-    if os.path.exists("samples/snippets/requirements.txt"):
-        session.install("-r", "samples/snippets/requirements.txt")
-
-    if os.path.exists("samples/snippets/requirements-test.txt"):
-        session.install("-r", "samples/snippets/requirements-test.txt")
-
     prerel_deps = [
         "protobuf",
         # dependency of grpc
@@ -405,11 +400,19 @@ def prerelease_deps(session):
     system_test_folder_path = os.path.join("tests", "system")
 
     # Only run system tests if found.
-    if os.path.exists(system_test_path) or os.path.exists(system_test_folder_path):
-        session.run("py.test", "tests/system")
-
-    snippets_test_path = os.path.join("samples", "snippets")
-
-    # Only run samples tests if found.
-    if os.path.exists(snippets_test_path):
-        session.run("py.test", "samples/snippets")
+    if os.path.exists(system_test_path):
+        session.run(
+            "py.test",
+            "--verbose",
+            f"--junitxml=system_{session.python}_sponge_log.xml",
+            system_test_path,
+            *session.posargs,
+        )
+    if os.path.exists(system_test_folder_path):
+        session.run(
+            "py.test",
+            "--verbose",
+            f"--junitxml=system_{session.python}_sponge_log.xml",
+            system_test_folder_path,
+            *session.posargs,
+        )
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 import setuptools  # type: ignore
 
-version = "1.2.1"
+version = "1.2.2"
 
 package_root = os.path.abspath(os.path.dirname(__file__))
 
@@ -41,8 +41,8 @@
     include_package_data=True,
     install_requires=(
         "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
-        "proto-plus >= 1.15.0, <2.0.0dev",
-        "protobuf >= 3.19.0, <4.0.0dev",
+        "proto-plus >= 1.22.0, <2.0.0dev",
+        "protobuf >= 3.19.0, <5.0.0dev",
     ),
     python_requires=">=3.7",
     classifiers=[

diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
@@ -6,5 +6,5 @@
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
 google-api-core==1.32.0
-proto-plus==1.15.0
+proto-plus==1.22.0
 protobuf==3.19.0