From 71989e70affb68914f386e72eb48f2d53210b3bf Mon Sep 17 00:00:00 2001 From: Muhong Guo Date: Fri, 31 May 2024 20:23:28 +0800 Subject: [PATCH] Restricts the protobuf version to <5.0.0 in setup.py (#413) # Description Restricts the protobuf version to <5.0.0 in setup.py and closes https://github.com/NVIDIA-Omniverse/orbit/issues/412 ## Type of change - Bug fix (non-breaking change which fixes an issue) ## Screenshots | Before | After | | ------ | ----- | | ![image](https://github.com/NVIDIA-Omniverse/orbit/assets/17403324/cc41ae19-a22c-472b-8ab8-aa21d2b0b55d) | ![image](https://github.com/NVIDIA-Omniverse/orbit/assets/17403324/eabf360b-5205-4eb6-a6ca-9403a94ad6d5) | ## Checklist - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./orbit.sh --format` - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have run all the tests with `./orbit.sh --test` and they pass - [ ] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --- CONTRIBUTORS.md | 2 +- source/extensions/omni.isaac.orbit_tasks/setup.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 33c041e0a4..df806b1d5b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -39,9 +39,9 @@ Guidelines for modifications: * Chenyu Yang * Jia Lin Yuan * Jingzhou Liu +* Kourosh Darvish * Lorenz Wellhausen * Muhong Guo -* Kourosh Darvish * Özhan Özen * Qinxi Yu * René Zurbrügg diff --git a/source/extensions/omni.isaac.orbit_tasks/setup.py b/source/extensions/omni.isaac.orbit_tasks/setup.py index 899b96703c..4f21105521 100644 --- a/source/extensions/omni.isaac.orbit_tasks/setup.py +++ b/source/extensions/omni.isaac.orbit_tasks/setup.py @@ -22,7 +22,9 @@ "numpy", "torch==2.0.1", "torchvision>=0.14.1", # ensure compatibility with torch 1.13.1 - "protobuf>=3.20.2", + # 5.26.0 introduced a breaking change, so we restricted it for now. + # See issue https://github.com/tensorflow/tensorboard/issues/6808 for details. + "protobuf >= 3.19.6, < 5.0.0", # data collection "h5py", # basic logger