Skip to content

Commit 0320376

Browse files
authored
Resolve failing azure-storage-extensions temporarily (#43736)
* pin nh3<0.3 on pypy3.9 * use pypy39 on matrix for storage ci
1 parent 93a80ec commit 0320376

File tree

4 files changed

+80
-0
lines changed

4 files changed

+80
-0
lines changed

eng/ci_tools.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pyproject-api==1.8.0
1414
cibuildwheel==2.16.5
1515
importlib-metadata==8.5.0
1616
build==1.2.2.post1
17+
nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9"
1718

1819
# requirements leveraged for testing
1920
pytest==8.3.5

eng/test_tools.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ bandit==1.6.2
99
stevedore==5.4.1
1010
pyproject-api==1.8.0
1111
build==1.2.2.post1
12+
nh3<0.3; platform_python_implementation == "PyPy" and python_version == "3.9"
1213

1314
# locking packages defined as deps from azure-sdk-tools
1415
Jinja2==3.1.6

sdk/storage/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ extends:
3939
ServiceDirectory: storage
4040
TestProxy: true
4141
TestTimeoutInMinutes: 120
42+
MatrixConfigs:
43+
- Name: storage_ci_matrix
44+
Path: sdk/storage/platform-matrix.json
45+
Selection: sparse
46+
GenerateVMJobs: true
4247
MatrixFilters:
4348
- PythonVersion=^(?!pypy3).*
4449
Artifacts:

sdk/storage/platform-matrix.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"displayNames": {
3+
"--disablecov": "",
4+
"false": "",
5+
"true": ""
6+
},
7+
"matrix": {
8+
"Agent": {
9+
"ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
10+
"windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
11+
},
12+
"PythonVersion": [ "3.10", "3.12" ],
13+
"CoverageArg": "--disablecov",
14+
"TestSamples": "false"
15+
},
16+
"include": [
17+
{
18+
"MacTestConfig": {
19+
"macos311": {
20+
"OSVmImage": "env:MACVMIMAGE",
21+
"Pool": "env:MACPOOL",
22+
"PythonVersion": "3.11",
23+
"CoverageArg": "--disablecov",
24+
"TestSamples": "false"
25+
}
26+
}
27+
},
28+
{
29+
"PyPyConfig": {
30+
"ubuntu2404_pypy39": {
31+
"OSVmImage": "env:LINUXVMIMAGE",
32+
"Pool": "env:LINUXPOOL",
33+
"PythonVersion": "pypy3.9",
34+
"CoverageArg": "--disablecov",
35+
"TestSamples": "false"
36+
}
37+
}
38+
},
39+
{
40+
"CoverageConfig": {
41+
"ubuntu2404_39_coverage": {
42+
"OSVmImage": "env:LINUXVMIMAGE",
43+
"Pool": "env:LINUXPOOL",
44+
"PythonVersion": "3.9",
45+
"CoverageArg": "",
46+
"TestSamples": "false"
47+
}
48+
}
49+
},
50+
{
51+
"Config": {
52+
"Ubuntu2404_313": {
53+
"OSVmImage": "env:LINUXVMIMAGE",
54+
"Pool": "env:LINUXPOOL",
55+
"PythonVersion": "3.13",
56+
"CoverageArg": "--disablecov",
57+
"TestSamples": "false"
58+
}
59+
}
60+
},
61+
{
62+
"Config": {
63+
"Ubuntu2404_314": {
64+
"OSVmImage": "env:LINUXVMIMAGE",
65+
"Pool": "env:LINUXPOOL",
66+
"PythonVersion": "3.14",
67+
"CoverageArg": "--disablecov",
68+
"TestSamples": "false"
69+
}
70+
}
71+
}
72+
]
73+
}

0 commit comments

Comments
 (0)