fix(deps): allow protobuf < 5.0.0 (#781)

parthea · web-flow · commit eee5f31b2fe9 · 2022-08-12T08:49:58.000-04:00
* fix(deps): allow protobuf &lt; 5.0.0\nfix(deps): require proto-plus &gt;= 1.22.0

* fix(deps): require proto-plus &gt;= 1.22.0

* fix(deps): require proto-plus &gt;= 1.22.0

* update constraints

* fix prerelease session
diff --git a/noxfile.py b/noxfile.py
@@ -371,7 +371,8 @@ def docfx(session):
 
 
 @nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
-def prerelease_deps(session):
+@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
+def prerelease_deps(session, database_dialect):
     """Run all tests with prerelease versions of dependencies installed."""
 
     # Install all dependencies
diff --git a/owlbot.py b/owlbot.py
@@ -288,6 +288,13 @@ def system(session, database_dialect):""",
             },"""
 )
 
+s.replace(
+    "noxfile.py",
+    """def prerelease_deps\(session\):""",
+    """@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
+def prerelease_deps(session, database_dialect):"""
+)
+
 s.replace(
     "noxfile.py",
     r"""# Install all test dependencies, then install this package into the
diff --git a/setup.py b/setup.py
@@ -32,10 +32,10 @@
     "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.*",
     "google-cloud-core >= 1.4.1, < 3.0dev",
     "grpc-google-iam-v1 >= 0.12.4, <1.0.0dev",
-    "proto-plus >= 1.15.0, <2.0.0dev, != 1.19.6",
+    "proto-plus >= 1.22.0, <2.0.0dev",
     "sqlparse >= 0.3.0",
     "packaging >= 14.3",
-    "protobuf >= 3.19.0, <4.0.0dev",
+    "protobuf >= 3.19.0, <5.0.0dev",
 ]
 extras = {
     "tracing": [
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
@@ -9,7 +9,7 @@ google-api-core==1.32.0
 google-cloud-core==1.4.1
 grpc-google-iam-v1==0.12.4
 libcst==0.2.5
-proto-plus==1.15.0
+proto-plus==1.22.0
 sqlparse==0.3.0
 opentelemetry-api==1.1.0
 opentelemetry-sdk==1.1.0
