From b266dbba4f8e0302299810edc90840b8a6716724 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Tue, 19 Aug 2025 12:58:39 -0700 Subject: [PATCH 1/3] Cherry-picked commit with merge conflict --- .ci/docker/requirements-ci.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index c6490242d632e..8540466ca464a 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -258,10 +258,17 @@ scipy==1.14.1 ; python_version > "3.9" #Pinned versions: #test that import: +<<<<<<< HEAD tb-nightly==2.13.0a20230426 #Description: TensorBoard #Pinned versions: #test that import: +======= +tlparse==0.3.25 +#Description: parse logs produced by torch.compile +#Pinned versions: +#test that import: dynamo/test_structured_trace.py +>>>>>>> 2feede28593 ([release/2.6] Remove tb-nightly (#2535)) # needed by torchgen utils typing-extensions>=4.10.0 From d5e0950a350844575a8ab7e5a353409350ec616a Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Tue, 19 Aug 2025 14:26:59 -0700 Subject: [PATCH 2/3] Update requirements-ci.txt --- .ci/docker/requirements-ci.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 8540466ca464a..cc45ca4bca72c 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -258,17 +258,10 @@ scipy==1.14.1 ; python_version > "3.9" #Pinned versions: #test that import: -<<<<<<< HEAD -tb-nightly==2.13.0a20230426 -#Description: TensorBoard -#Pinned versions: -#test that import: -======= tlparse==0.3.25 #Description: parse logs produced by torch.compile #Pinned versions: #test that import: dynamo/test_structured_trace.py ->>>>>>> 2feede28593 ([release/2.6] Remove tb-nightly (#2535)) # needed by torchgen utils typing-extensions>=4.10.0 From 6b550497a1cc437cac6cc1cd392fad3ff696c7c0 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Tue, 19 Aug 2025 14:27:24 -0700 Subject: [PATCH 3/3] Update requirements-ci.txt --- .ci/docker/requirements-ci.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index cc45ca4bca72c..640095a068343 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -258,11 +258,6 @@ scipy==1.14.1 ; python_version > "3.9" #Pinned versions: #test that import: -tlparse==0.3.25 -#Description: parse logs produced by torch.compile -#Pinned versions: -#test that import: dynamo/test_structured_trace.py - # needed by torchgen utils typing-extensions>=4.10.0 #Description: type hints for python