Skip to content

Commit 3ee9a41

Browse files
saran-tcopybara-github
authored andcommitted
Lower protobuf version requirement.
This is to prevent conflict with TensorFlow. Fixes #339. PiperOrigin-RevId: 472258727 Change-Id: I886360eb687d62192bad2ccb94266c207efd2050
1 parent 62518df commit 3ee9a41

3 files changed

Lines changed: 88 additions & 5 deletions

File tree

dm_control/locomotion/mocap/mocap_pb2.py

Lines changed: 86 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ nose-xunitmp==0.4.1
1212
numpy==1.21.6; python_version == '3.7'
1313
numpy==1.23.1; python_version >= '3.8'
1414
Pillow==9.2.0
15-
protobuf==3.20.1
15+
protobuf==3.19.4 # TensorFlow requires protobuf<3.20 (b/182876485)
1616
pyopengl==3.1.6
1717
pyparsing==2.4.7
1818
requests==2.28.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def is_excluded(s):
203203
'lxml',
204204
'mujoco >= 2.2.1',
205205
'numpy >= 1.9.0',
206-
'protobuf >= 3.20.1',
206+
'protobuf >= 3.19.4', # TensorFlow requires protobuf<3.20 (b/182876485)
207207
'pyopengl >= 3.1.4',
208208
'pyparsing < 3.0.0',
209209
'requests',

0 commit comments

Comments
 (0)