From 0264bf5e2594cd7c7a2cbb0fcfbf097aca08b28b Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Tue, 19 Aug 2025 12:58:39 -0700 Subject: [PATCH 1/2] 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 f12be92975054..73528fbd4ff23 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 3cbd93acdd143e599d8be91a037d4c4e50dafe4b Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Tue, 19 Aug 2025 14:28:04 -0700 Subject: [PATCH 2/2] Update requirements-ci.txt --- .ci/docker/requirements-ci.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 73528fbd4ff23..12c2f5678c5a5 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -258,18 +258,6 @@ 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 #Description: type hints for python