Skip to content

Commit

Permalink
Fix CI (Azure#39043)
Browse files Browse the repository at this point in the history
* nothing change

* remove version pin

* try changing pf requirements to repo

* try again

* fix setup syntax

* try another format

* try again

* try again, again

* undo stuff

* undo whitespace

* remove pf_service_isolation

* undo setup change

* pin pf to current

* upate package to use python 3.9 at least

* get the changes ready. when they confirm which CI I'll submit the PR

* move necessary requirements

---------

Co-authored-by: Scott Beddall <[email protected]>
  • Loading branch information
MilesHolland and scbedd authored Jan 13, 2025
1 parent 9202986 commit 735259d
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 39 deletions.
1 change: 1 addition & 0 deletions sdk/evaluation/azure-ai-evaluation/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- Fixed the non adversarial simulator to run in task-free mode

### Other Changes
- Changed minimum required python version to use this package from 3.8 to 3.9
- Stop dependency on the local promptflow service. No promptflow service will automatically start when running evaluation.

## 1.1.0 (2024-12-12)
Expand Down
2 changes: 1 addition & 1 deletion sdk/evaluation/azure-ai-evaluation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Azure AI SDK provides following to evaluate Generative AI Applications:

### Prerequisites

- Python 3.8 or later is required to use this package.
- Python 3.9 or later is required to use this package.
- [Optional] You must have [Azure AI Project][ai_project] or [Azure Open AI][azure_openai] to use AI-assisted evaluators

### Install the package
Expand Down
2 changes: 1 addition & 1 deletion sdk/evaluation/azure-ai-evaluation/samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Each samples file is run during the azure-sdk-for-python Build CI to ensure that

## Prerequisites

* Python 3.8, 3.9, 3.10, 3.11, or 3.12 is required to use this package
* Python 3.9, 3.10, 3.11, or 3.12 is required to use this package
* You must have an [Azure subscription](https://azure.microsoft.com/free/) to run these samples.
* You must have an Azure AI project and a model deployment.

Expand Down
7 changes: 3 additions & 4 deletions sdk/evaluation/azure-ai-evaluation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand All @@ -63,10 +62,10 @@
"azure.ai",
]
),
python_requires=">=3.8",
python_requires=">=3.9",
install_requires=[
"promptflow-devkit>=1.15.0",
"promptflow-core>=1.15.0",
"promptflow-devkit>=1.17.1",
"promptflow-core>=1.17.1",
"pyjwt>=2.8.0",
# pickle support for credentials was added to this release
"azure-identity>=1.16.0",
Expand Down
28 changes: 0 additions & 28 deletions sdk/evaluation/azure-ai-evaluation/tests/__pf_service_isolation.py

This file was deleted.

1 change: 0 additions & 1 deletion sdk/evaluation/azure-ai-evaluation/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from .__openai_patcher import TestProxyConfig, TestProxyHttpxClientBase # isort: split
from . import __pf_service_isolation # isort: split # noqa: F401

import os
import json
Expand Down
4 changes: 2 additions & 2 deletions sdk/evaluation/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ extends:
TestProxy: true
# This custom matrix config should be dropped once:
# * Once azure-ai-ml supports 3.13 (currently crashes due to type annotation)
MatrixConfigs:
MatrixConfigs:
- Name: ai_ci_matrix
Path: sdk/evaluation/platform-matrix.json
Selection: sparse
GenerateVMJobs: true
MatrixFilters:
- PythonVersion=^(?!3\.13)
- PythonVersion=^(?!(3\.13|3\.8))
Artifacts:
- name: azure-ai-evaluation
safeName: azureaievaluation
2 changes: 1 addition & 1 deletion sdk/evaluation/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" },
"ubuntu-20.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
},
"PythonVersion": [ "3.8", "3.11", "3.10" ],
"PythonVersion": [ "3.9", "3.11", "3.10" ],
"CoverageArg": "--disablecov",
"TestSamples": "false"
},
Expand Down
2 changes: 1 addition & 1 deletion tools/azure-sdk-tools/ci_tools/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

TEST_COMPATIBILITY_MAP = {
"azure-ai-ml": ">=3.7, !=3.13.*",
"azure-ai-evaluation": ">=3.7, !=3.13.*"
"azure-ai-evaluation": ">=3.9, !=3.13.*"
}
TEST_PYTHON_DISTRO_INCOMPATIBILITY_MAP = {
"azure-storage-blob": "pypy",
Expand Down

0 comments on commit 735259d

Please sign in to comment.