Skip to content

Commit 165bc56

Browse files
mtsokolcopybara-github
authored andcommitted
Upgrade protobuf to match with TF 2.20.0rc0
PiperOrigin-RevId: 791214571
1 parent 82a8aae commit 165bc56

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ module(
2222
)
2323

2424
bazel_dep(name = "rules_proto", version = "7.0.2")
25-
bazel_dep(name = "rules_python", version = "0.37.0")
26-
bazel_dep(name = "platforms", version = "0.0.10")
27-
bazel_dep(name = "protobuf", version = "28.3")
25+
bazel_dep(name = "rules_python", version = "1.0.0")
26+
bazel_dep(name = "platforms", version = "0.0.11")
27+
bazel_dep(name = "protobuf", version = "31.1")
2828
bazel_dep(name = "googletest", version = "1.15.2")
29-
bazel_dep(name = "abseil-cpp", version = "20240722.0")
29+
bazel_dep(name = "abseil-cpp", version = "20250127.0")
3030
bazel_dep(name = "abseil-py", version = "2.1.0")
3131
bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
3232
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c")

beam/examples/requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
array-record[beam]
2-
google-cloud-storage==2.11.0
3-
tensorflow==2.14.0

oss/build_whl.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ function main() {
8787
echo $(date) : "=== Output wheel file is in: ${DEST}"
8888

8989
# Install ArrayRecord from the wheel and run smoke tests.
90-
$PYTHON_BIN -m pip install --find-links="${DEST}" --pre array-record
90+
$PYTHON_BIN -m pip install ${OUTPUT_DIR}/all_dist/array_record*.whl
9191
$PYTHON_BIN -c 'import array_record'
9292
$PYTHON_BIN -c 'from array_record.python import array_record_data_source'
9393
# TF is not available on Python 3.13 and above.
9494
if [ "$(uname)" != "Darwin" ] && (( "${PYTHON_MINOR_VERSION}" < 13 )); then
95-
$PYTHON_BIN -m pip install jax tensorflow grain
95+
$PYTHON_BIN -m pip install jax tensorflow>=2.20.0rc0 grain
9696
$PYTHON_BIN oss/test_import_grain.py
9797
$PYTHON_BIN oss/test_import_tensorflow.py
9898
fi
9999
}
100100

101-
main
101+
main

setup.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@
99
'etils[epath]',
1010
]
1111

12+
TF_PACKAGE = ['tensorflow>=2.20.0rc0']
13+
1214
BEAM_EXTRAS = [
13-
'apache-beam[gcp]==2.53.0',
15+
'apache-beam[gcp]>=2.53.0',
1416
'google-cloud-storage>=2.11.0',
15-
'tensorflow>=2.14.0'
16-
]
17+
] + TF_PACKAGE
18+
19+
TEST_EXTRAS = [
20+
'jax',
21+
'grain',
22+
] + TF_PACKAGE
1723

1824

1925
class BinaryDistribution(Distribution):
@@ -34,7 +40,7 @@ def has_ext_modules(self):
3440
package_data={'': ['*.so']},
3541
python_requires='>=3.10',
3642
install_requires=REQUIRED_PACKAGES,
37-
extras_require={'beam': BEAM_EXTRAS},
43+
extras_require={'beam': BEAM_EXTRAS, 'test': TEST_EXTRAS},
3844
url='https://github.com/google/array_record',
3945
license='Apache-2.0',
4046
classifiers=[

0 commit comments

Comments
 (0)