Merge branch 'main' into zhengfei/bugfix/add-user-agent

microsoft · Jun 17, 2024 · 32f308f · 32f308f
2 parents d94c45a + 36883b4
commit 32f308f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/promptflow-azure/pyproject.toml b/src/promptflow-azure/pyproject.toml
@@ -65,6 +65,7 @@ promptflow-tracing = {path = "../promptflow-tracing"}
 promptflow = {path = "../promptflow"}
 promptflow-tools = {path = "../promptflow-tools"}
 promptflow-recording =  {path = "../promptflow-recording"}
+numpy = "<2.0.0"  # avoid pandas incompatibility
 
 [tool.poetry.group.test.dependencies]
 pytest = "*"

diff --git a/src/promptflow-devkit/pyproject.toml b/src/promptflow-devkit/pyproject.toml
@@ -99,6 +99,7 @@ promptflow-tracing = {path = "../promptflow-tracing"}
 promptflow = {path = "../promptflow"}
 promptflow-tools = {path = "../promptflow-tools"}
 promptflow-recording =  {path = "../promptflow-recording"}
+numpy = "<2.0.0"  # avoid pandas incompatibility
 
 [tool.poetry.group.test.dependencies]
 pytest = "*"

diff --git a/src/promptflow-tools/tests/test_acs.py b/src/promptflow-tools/tests/test_acs.py
@@ -3,6 +3,7 @@
 from promptflow.tools.azure_content_safety import analyze_text
 
 
+@pytest.mark.skip("Skipping - Key based authentication is disabled for this resource")
 @pytest.mark.usefixtures("use_secrets_config_file")
 class TestAzureContentSafety:
     def test_azure_content_safety_analyze_happy_path(self, azure_content_safety_connection):