From 71515ba662eab96554a2f7f3b02375385f680ebd Mon Sep 17 00:00:00 2001 From: Nico Galoppo Date: Sun, 15 May 2022 22:35:50 -0700 Subject: [PATCH 1/2] Revert Open3D to 0.11.2 This change fixes a dependency conflict that causes a very old version of Jinja2 to be installed (see #4618). Open3D is only used for PCD conversion, so this reverting to an older version is acceptable. This is a temporary workaround. As a future update we'd like to get rid of the Open3D dependency, since it pulls in a bunch of unnecessary dependencies. Also, we'd like to make python dependency resolution more robust by pinning all (recursive) dependencies to specific versions with a tool like pip-tools or poetry. --- cvat/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index 72db5421..0caaa0af 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -42,7 +42,7 @@ tensorflow==2.8.0 # Optional requirement of Datumaro. Use tensorflow-macos==2.8. # archives. Don't use as a python module because it has GPL license. patool==1.12 diskcache==5.0.2 -open3d==0.14.1 +open3d==0.11.2 boto3==1.17.61 azure-storage-blob==12.8.1 google-cloud-storage==1.42.0 From b7dba6aaf2dabdeca8303cad2bf5f7da69a3b13b Mon Sep 17 00:00:00 2001 From: Nico Galoppo Date: Mon, 16 May 2022 13:44:12 -0700 Subject: [PATCH 2/2] Update CHANGELOG to reflect PR 4639 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de8d411..43c925bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - TDB ### Fixed -- TDB +- Revert Open3D to 0.11.2 to prevent depencency conflicts () ### Security - TDB