From c697e8207b3d9d30bf2eb3bc12e6d50bbfafe773 Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 08:51:08 +0000 Subject: [PATCH 1/7] pin tenacity<8.4.0 --- .github/workflows/promptflow-import-linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/promptflow-import-linter.yml b/.github/workflows/promptflow-import-linter.yml index cafa3bfc81d..f1206c0d452 100644 --- a/.github/workflows/promptflow-import-linter.yml +++ b/.github/workflows/promptflow-import-linter.yml @@ -35,6 +35,7 @@ jobs: poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-azure touch src/promptflow-evals/promptflow/__init__.py poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-evals + poetry run pip install tenacity<8.4.0 working-directory: ${{ env.WORKING_DIRECTORY }} - name: import lint run: | From 169126818093b28d974f2a68ad9f82ea68d81594 Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 08:53:48 +0000 Subject: [PATCH 2/7] handle some other CI --- .github/workflows/build_doc_ci.yml | 4 ++-- .github/workflows/promptflow-executor-e2e-test.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_doc_ci.yml b/.github/workflows/build_doc_ci.yml index a2176567a03..c9f48e02669 100644 --- a/.github/workflows/build_doc_ci.yml +++ b/.github/workflows/build_doc_ci.yml @@ -52,7 +52,7 @@ jobs: shell: powershell working-directory: scripts/docs/ run: |- - pip install langchain + pip install langchain tenacity<8.4.0 ./doc_generation.ps1 -WithReferenceDoc:$true -WarningAsError:$true # Note: We have this job separately because some error may missing when build link check exists. @@ -85,5 +85,5 @@ jobs: shell: powershell working-directory: scripts/docs/ run: |- - pip install langchain + pip install langchain tenacity<8.4.0 ./doc_generation.ps1 -WithReferenceDoc:$true -WarningAsError:$true -BuildLinkCheck diff --git a/.github/workflows/promptflow-executor-e2e-test.yml b/.github/workflows/promptflow-executor-e2e-test.yml index 93af8cdb637..705b02a117d 100644 --- a/.github/workflows/promptflow-executor-e2e-test.yml +++ b/.github/workflows/promptflow-executor-e2e-test.yml @@ -148,7 +148,7 @@ jobs: run: | gci env:* | sort-object name az account show - pip install langchain-community + pip install langchain-community tenacity<8.4.0 # numexpr is required by langchain in e2e tests. pip install numexpr python scripts/building/run_coverage_tests.py ` From 0cbdf41b49df2f3a2892f82f90a7be48d9bc2e2d Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 08:54:12 +0000 Subject: [PATCH 3/7] executor ut --- .github/workflows/promptflow-executor-unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promptflow-executor-unit-test.yml b/.github/workflows/promptflow-executor-unit-test.yml index 214a82495db..969fcff2757 100644 --- a/.github/workflows/promptflow-executor-unit-test.yml +++ b/.github/workflows/promptflow-executor-unit-test.yml @@ -150,7 +150,7 @@ jobs: run: | gci env:* | sort-object name az account show - pip install langchain-community + pip install langchain-community tenacity<8.4.0 python scripts/building/run_coverage_tests.py ` -p ${{ env.testWorkingDirectory }}/promptflow ` -t ${{ env.testWorkingDirectory }}/tests/executor/unittests ` From d444c837b3aea41dd22fdcdb06e6766f77979897 Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 09:05:23 +0000 Subject: [PATCH 4/7] fix --- .github/workflows/promptflow-import-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promptflow-import-linter.yml b/.github/workflows/promptflow-import-linter.yml index f1206c0d452..a8040dbffdc 100644 --- a/.github/workflows/promptflow-import-linter.yml +++ b/.github/workflows/promptflow-import-linter.yml @@ -35,7 +35,7 @@ jobs: poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-azure touch src/promptflow-evals/promptflow/__init__.py poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-evals - poetry run pip install tenacity<8.4.0 + poetry install tenacity<8.4.0 working-directory: ${{ env.WORKING_DIRECTORY }} - name: import lint run: | From 8fcee78aa0997ad652310130ac0e5be302d0b0e8 Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 09:11:52 +0000 Subject: [PATCH 5/7] add "" --- .github/workflows/promptflow-import-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promptflow-import-linter.yml b/.github/workflows/promptflow-import-linter.yml index a8040dbffdc..973ad336266 100644 --- a/.github/workflows/promptflow-import-linter.yml +++ b/.github/workflows/promptflow-import-linter.yml @@ -35,7 +35,7 @@ jobs: poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-azure touch src/promptflow-evals/promptflow/__init__.py poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-evals - poetry install tenacity<8.4.0 + poetry install "tenacity<8.4.0" working-directory: ${{ env.WORKING_DIRECTORY }} - name: import lint run: | From d19b2b39a8ce97cb5fd210663c45c7842baead81 Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 09:16:55 +0000 Subject: [PATCH 6/7] use poetry run pip install --- .github/workflows/promptflow-import-linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promptflow-import-linter.yml b/.github/workflows/promptflow-import-linter.yml index 973ad336266..70210aa2302 100644 --- a/.github/workflows/promptflow-import-linter.yml +++ b/.github/workflows/promptflow-import-linter.yml @@ -35,7 +35,7 @@ jobs: poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-azure touch src/promptflow-evals/promptflow/__init__.py poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-evals - poetry install "tenacity<8.4.0" + poetry run pip install "tenacity<8.4.0" working-directory: ${{ env.WORKING_DIRECTORY }} - name: import lint run: | From 449312fcbd78eb3317a3536831040f9d5c2b9a57 Mon Sep 17 00:00:00 2001 From: Zhengfei Wang Date: Mon, 17 Jun 2024 09:23:15 +0000 Subject: [PATCH 7/7] correct place --- .github/workflows/promptflow-import-linter.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/promptflow-import-linter.yml b/.github/workflows/promptflow-import-linter.yml index 70210aa2302..51a2a07bd29 100644 --- a/.github/workflows/promptflow-import-linter.yml +++ b/.github/workflows/promptflow-import-linter.yml @@ -35,7 +35,6 @@ jobs: poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-azure touch src/promptflow-evals/promptflow/__init__.py poetry install --with dev -C ${{ env.WORKING_DIRECTORY }}/src/promptflow-evals - poetry run pip install "tenacity<8.4.0" working-directory: ${{ env.WORKING_DIRECTORY }} - name: import lint run: | @@ -68,5 +67,5 @@ jobs: echo "=== promptflow-azure full lints ===" poetry run pip install langchain + poetry run pip install "tenacity<8.4.0" poetry run python ${{ github.workspace }}/scripts/import_linter/import_linter.py -