Skip to content

Commit a6bb4d6

Browse files
authored
Update pypy usage in build matrix (Azure#31870)
* update all platform matrix pypy37 to pypy39+pypy310 * unpin cryptography * remove the pypy310 as its not resolving on the predefined build matrix * fix pyopenssl conflict with older cryptography
1 parent c896d7b commit a6bb4d6

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

eng/ci_tools.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# requirements leveraged by ci tools
2-
cryptography<4
32
setuptools==67.6.0; python_version >= '3.5'
43
virtualenv==20.23.0
54
wheel==0.37.0
@@ -19,7 +18,7 @@ typing-extensions<=4.6.3
1918

2019
# locking packages defined as deps from azure-sdk-tools or azure-devtools
2120
pytoml==0.1.21
22-
pyOpenSSL==21.0.0
21+
pyOpenSSL==23.2.0
2322
json-delta==2.0
2423
ConfigArgParse==1.2.3
2524
six==1.14.0

eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
88
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
99
},
10-
"PythonVersion": [ "pypy3.7", "3.8" ],
10+
"PythonVersion": [ "pypy3.9", "3.8" ],
1111
"CoverageArg": "--disablecov"
1212
},
1313
"include": [

eng/pipelines/templates/stages/platform-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" },
1111
"macos-11": { "OSVmImage": "macos-11", "Pool": "Azure Pipelines" }
1212
},
13-
"PythonVersion": [ "pypy3.7", "3.7", "3.8", "3.10" ],
13+
"PythonVersion": [ "pypy3.9", "3.7", "3.8", "3.10" ],
1414
"CoverageArg": "--disablecov",
1515
"TestSamples": "false"
1616
},

eng/regression_test_tools.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
pip==20.2
2-
cryptography<4
32

43
# requirements leveraged by ci for testing
54
pytest==7.3.1
@@ -17,7 +16,7 @@ typing-extensions<=4.6.3
1716
# locking packages defined as deps from azure-sdk-tools or azure-devtools
1817
pytoml==0.1.21
1918
readme-renderer[md]==25.0
20-
pyOpenSSL==21.0.0
19+
pyOpenSSL==23.2.0
2120
json-delta==2.0
2221
ConfigArgParse==1.2.3
2322
six==1.14.0

eng/regression_tools.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ typing-extensions<=4.6.3
1919

2020
# locking packages defined as deps from azure-sdk-tools or azure-devtools
2121
pytoml==0.1.21
22-
pyOpenSSL==21.0.0
22+
pyOpenSSL==23.2.0
2323
json-delta==2.0
2424
ConfigArgParse==1.2.3
2525
six==1.14.0

eng/test_tools.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cryptography<4
2-
31
# requirements leveraged by ci for testing
42
pytest==7.3.1
53
pytest-asyncio==0.21.0
@@ -16,7 +14,7 @@ typing-extensions<=4.6.3
1614
# locking packages defined as deps from azure-sdk-tools or azure-devtools
1715
pytoml==0.1.21
1816
readme-renderer[md]==25.0
19-
pyOpenSSL==21.0.0
17+
pyOpenSSL==23.2.0
2018
json-delta==2.0
2119
ConfigArgParse==1.2.3
2220
six==1.14.0

sdk/storage/platform-matrix-all-versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"include": [
2727
{
2828
"CoverageConfig": {
29-
"ubuntu2004_pypy37": {
29+
"ubuntu2004_pypy39": {
3030
"OSVmImage": "MMSUbuntu20.04",
3131
"Pool": "azsdk-pool-mms-ubuntu-2004-general",
32-
"PythonVersion": "pypy3.7",
32+
"PythonVersion": "pypy3.9",
3333
"CoverageArg": "--disablecov",
3434
"TestSamples": "false"
3535
}

0 commit comments

Comments
 (0)