Skip to content

Commit

Permalink
fix(deps): update grpc extra to require grpcio >= 1.51.3 (#190)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
3 people committed Nov 23, 2023
1 parent 394939a commit 4643f9c
Show file tree
Hide file tree
Showing 6 changed files with 295 additions and 269 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
digest: sha256:4f9b3b106ad0beafc2c8a415e3f62c1a0cc23cabea115dbe841b848f581cfe99
# created: 2023-10-18T20:26:37.410353675Z
digest: sha256:caffe0a9277daeccc4d1de5c9b55ebba0901b57c2f713ec9c876b0d4ec064f61
# created: 2023-11-08T19:46:45.022803742Z
532 changes: 275 additions & 257 deletions .kokoro/requirements.txt

Large diffs are not rendered by default.

20 changes: 13 additions & 7 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def default(session):

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

# Run py.test against the unit tests.
session.run(
Expand Down Expand Up @@ -113,7 +113,7 @@ def system(session):

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

# Run py.test against the system tests.
if system_test_exists:
Expand All @@ -125,7 +125,10 @@ def system(session):
@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11"])
@nox.parametrize(
"library",
["python-pubsub", "python-speech"],
[
("python-pubsub", None),
("google-cloud-python", "google-cloud-speech"),
],
ids=["pubsub", "speech"],
)
def test(session, library):
Expand All @@ -141,24 +144,27 @@ def test(session, library):
* Text-to-Speech: Full GAPIC.
* Speech: Full GAPIC, has long running operations.
"""
repository, package = library
try:
session.run("git", "-C", library, "pull", external=True)
session.run("git", "-C", repository, "pull", external=True)
except nox.command.CommandFailed:
session.run(
"git",
"clone",
"--single-branch",
f"https://github.com/googleapis/{library}",
f"https://github.com/googleapis/{repository}",
external=True,
)

session.cd(library)
session.cd(repository)
if package:
session.cd(f'packages/{package}')

unit(session)

# system tests are run on 3.7 only
if session.python == "3.7":
if library == "python-pubsub":
if repository == "python-pubsub":
session.install("psutil")
session.install("flaky")
system(session)
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"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",
]

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

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

Expand Down
2 changes: 1 addition & 1 deletion testing/constraints-3.7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
# Then this file should have foo==1.14.0
protobuf==3.19.5
grpcio==1.44.0
grpcio==1.51.3
2 changes: 1 addition & 1 deletion testing/constraints-3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
# Then this file should have foo==1.14.0
protobuf==3.20.2
grpcio==1.44.0
grpcio==1.51.3

0 comments on commit 4643f9c

Please sign in to comment.