From dfdcedb0423847c4f6a6725ee8e5bb832b17667c 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 778fcbc87c059..74df57dea85c3 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -258,12 +258,16 @@ 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.30 +======= +tlparse==0.3.25 +>>>>>>> 2feede28593 ([release/2.6] Remove tb-nightly (#2535)) #Description: parse logs produced by torch.compile #Pinned versions: #test that import: dynamo/test_structured_trace.py From ab09cc2a96c0e09f0fe8cbff0f0b97e03ef96aba Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Tue, 19 Aug 2025 14:26:04 -0700 Subject: [PATCH 2/2] Update requirements-ci.txt --- .ci/docker/requirements-ci.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 74df57dea85c3..56abad7aafeb6 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -258,16 +258,7 @@ 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.30 -======= -tlparse==0.3.25 ->>>>>>> 2feede28593 ([release/2.6] Remove tb-nightly (#2535)) #Description: parse logs produced by torch.compile #Pinned versions: #test that import: dynamo/test_structured_trace.py