From 99c13955053800537d4f7985e06bfc0d9999b7f8 Mon Sep 17 00:00:00 2001 From: Mihir Paradkar Date: Mon, 22 May 2023 11:13:50 -0700 Subject: [PATCH] Pins protobuf version <= 3.20.0 to satisfy both Vizier and TensorFlow requirements. PiperOrigin-RevId: 534124782 --- kokoro/github/ubuntu/cpu/oldest/continuous.cfg | 2 +- kokoro/github/ubuntu/cpu/oldest/presubmit.cfg | 2 +- setup.py | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kokoro/github/ubuntu/cpu/oldest/continuous.cfg b/kokoro/github/ubuntu/cpu/oldest/continuous.cfg index 64d44859..871d566f 100644 --- a/kokoro/github/ubuntu/cpu/oldest/continuous.cfg +++ b/kokoro/github/ubuntu/cpu/oldest/continuous.cfg @@ -6,7 +6,7 @@ env_vars: { } env_vars: { key: "TF_VERSION" - value: "2.12.*" + value: "2.9.*" } env_vars: { key: "TAG_FILTERS" diff --git a/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg b/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg index 64d44859..871d566f 100644 --- a/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg +++ b/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg @@ -6,7 +6,7 @@ env_vars: { } env_vars: { key: "TF_VERSION" - value: "2.12.*" + value: "2.9.*" } env_vars: { key: "TAG_FILTERS" diff --git a/setup.py b/setup.py index 5404eab2..53698814 100644 --- a/setup.py +++ b/setup.py @@ -177,6 +177,9 @@ def get_version(): 'tensorflow>=2.9.0; platform_machine != "arm64" or platform_system != "Darwin"', 'tensorflow-macos>=2.9.0; platform_machine == "arm64" and platform_system == "Darwin"', # pylint:enable=g-line-too-long + # TODO(b/283835852): Remove when Vizier can upgrade to protobuf >= 4.0. + 'protobuf~=3.20.3', + 'wrapt~=1.13.0', ], python_requires='>=3.8,<4', packages=find_namespace_packages(