Skip to content

Commit eb8e87a

Browse files
fix(deps): update grpc extra to require grpcio >= 1.51.3 (#190)
* chore: bump urllib3 from 1.26.12 to 1.26.18 Source-Link: googleapis/synthtool@febaccc Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61 * cater for migration of python-speech to monorepo * update editable install in noxfile.py * fix(deps): update grpc extra to require grpcio >= 1.51.3 * update testing/constraints-3.9.txt --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent dc3f8e4 commit eb8e87a

6 files changed

Lines changed: 295 additions & 269 deletions

File tree

packages/googleapis-common-protos/.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:4f9b3b106ad0beafc2c8a415e3f62c1a0cc23cabea115dbe841b848f581cfe99
17-
# created: 2023-10-18T20:26:37.410353675Z
16+
digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
17+
# created: 2023-11-08T19:46:45.022803742Z

packages/googleapis-common-protos/.kokoro/requirements.txt

Lines changed: 275 additions & 257 deletions
Large diffs are not rendered by default.

packages/googleapis-common-protos/noxfile.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def default(session):
6161

6262
# Install googleapis-api-common-protos
6363
# This *must* be the last install command to get the package from source.
64-
session.install("e", "..", "-c", constraints_path)
64+
session.install("-e", ".", "-c", constraints_path)
6565

6666
# Run py.test against the unit tests.
6767
session.run(
@@ -113,7 +113,7 @@ def system(session):
113113

114114
# Install googleapis-api-common-protos
115115
# This *must* be the last install command to get the package from source.
116-
session.install("e", "..", "-c", constraints_path)
116+
session.install("-e", ".", "-c", constraints_path)
117117

118118
# Run py.test against the system tests.
119119
if system_test_exists:
@@ -125,7 +125,10 @@ def system(session):
125125
@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11"])
126126
@nox.parametrize(
127127
"library",
128-
["python-pubsub", "python-speech"],
128+
[
129+
("python-pubsub", None),
130+
("google-cloud-python", "google-cloud-speech"),
131+
],
129132
ids=["pubsub", "speech"],
130133
)
131134
def test(session, library):
@@ -141,24 +144,27 @@ def test(session, library):
141144
* Text-to-Speech: Full GAPIC.
142145
* Speech: Full GAPIC, has long running operations.
143146
"""
147+
repository, package = library
144148
try:
145-
session.run("git", "-C", library, "pull", external=True)
149+
session.run("git", "-C", repository, "pull", external=True)
146150
except nox.command.CommandFailed:
147151
session.run(
148152
"git",
149153
"clone",
150154
"--single-branch",
151-
f"https://github.com/googleapis/{library}",
155+
f"https://github.com/googleapis/{repository}",
152156
external=True,
153157
)
154158

155-
session.cd(library)
159+
session.cd(repository)
160+
if package:
161+
session.cd(f'packages/{package}')
156162

157163
unit(session)
158164

159165
# system tests are run on 3.7 only
160166
if session.python == "3.7":
161-
if library == "python-pubsub":
167+
if repository == "python-pubsub":
162168
session.install("psutil")
163169
session.install("flaky")
164170
system(session)

packages/googleapis-common-protos/setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
"protobuf>=3.19.5,<5.0.0.dev0,!=3.20.0,!=3.20.1,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
2727
]
2828

29-
extras_require = {"grpc": ["grpcio >= 1.44.0, <2.0.0.dev0"]}
29+
# Require grpcio >= 1.51.3 for compatibility with Mac M1
30+
# https://github.com/googleapis/python-pubsub/pull/900
31+
extras_require = {"grpc": ["grpcio >= 1.51.3, <2.0.0.dev0"]}
3032

3133
package_root = os.path.abspath(os.path.dirname(__file__))
3234

packages/googleapis-common-protos/testing/constraints-3.7.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
77
# Then this file should have foo==1.14.0
88
protobuf==3.19.5
9-
grpcio==1.44.0
9+
grpcio==1.51.3

packages/googleapis-common-protos/testing/constraints-3.9.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
77
# Then this file should have foo==1.14.0
88
protobuf==3.20.2
9-
grpcio==1.44.0
9+
grpcio==1.51.3

0 commit comments

Comments
 (0)