Skip to content

Commit 9571859

Browse files
authored
Py312 (#370)
* update cibuildwheel version * add 3.12 as targets * enable 312 only * re-enable other tests * update changelog * update setup file for 312 * update version * add x86, drop 3.7 * add in visual studio * remove py37 * update date ubuntu version * fix for windows build * clean up items
1 parent e506d70 commit 9571859

File tree

9 files changed

+146
-94
lines changed

9 files changed

+146
-94
lines changed

.azure-pipelines/client.test.live.yml

Lines changed: 79 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ trigger:
22
- main
33

44
variables:
5-
PythonVersion37: '3.7'
65
PythonVersion38: '3.8'
76
PythonVersion39: '3.9'
87
PythonVersion310: '3.10.0'
98
PythonVersion311: '3.11.0'
9+
PythonVersion312: '3.12.0'
1010
GetPip: 'https://bootstrap.pypa.io/get-pip.py'
1111

1212
jobs:
1313
- job: 'Windows'
1414

1515
pool:
1616
name: azsdk-pool-mms-win-2022-general
17-
vmImage: windows-2022
17+
vmImage: MMS2022
18+
variables:
19+
VS_INSTALLER_URL: "https://aka.ms/vs/17/release/vs_enterprise.exe"
20+
VS_INSTALLER_PATH: "$(Build.BinariesDirectory)/vs_enterprise.exe"
21+
VS_ENTERPRISE_PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise"
1822

1923
timeoutInMinutes: 120
2024

2125
strategy:
2226
maxParallel: 1
2327
matrix:
24-
x64 Python 3.7:
25-
PythonArchitecture: 'x64'
26-
PythonVersion: '$(PythonVersion37)'
27-
BWFilter: 'cp37-win_amd64'
2828
x64 Python 3.8:
2929
PythonArchitecture: 'x64'
3030
PythonVersion: '$(PythonVersion38)'
@@ -41,27 +41,27 @@ jobs:
4141
PythonArchitecture: 'x64'
4242
PythonVersion: '$(PythonVersion311)'
4343
BWFilter: 'cp311-win_amd64'
44-
# x86 Python 3.7:
45-
# PythonArchitecture: 'x86'
46-
# PythonVersion: '$(PythonVersion37)'
47-
# BWFilter: 'cp37-win32'
48-
# x86 Python 3.8:
49-
# PythonArchitecture: 'x86'
50-
# PythonVersion: '$(PythonVersion38)'
51-
# BWFilter: 'cp38-win32'
52-
# x86 Python 3.9:
53-
# PythonArchitecture: 'x86'
54-
# PythonVersion: '$(PythonVersion39)'
55-
# BWFilter: 'cp39-win32'
56-
# x86 Python 3.10:
57-
# PythonArchitecture: 'x86'
58-
# PythonVersion: '$(PythonVersion310)'
59-
# BWFilter: 'cp310-win32'
60-
# x86 Python 3.11:
61-
# PythonArchitecture: 'x86'
62-
# PythonVersion: '$(PythonVersion311)'
63-
# BWFilter: 'cp311-win32'
64-
44+
x64 Python 3.12:
45+
PythonArchitecture: 'x64'
46+
PythonVersion: '$(PythonVersion312)'
47+
BWFilter: 'cp312-win_amd64'
48+
x86 Python 3.8:
49+
PythonArchitecture: 'x86'
50+
PythonVersion: '$(PythonVersion38)'
51+
BWFilter: 'cp38-win32'
52+
x86 Python 3.9:
53+
PythonArchitecture: 'x86'
54+
PythonVersion: '$(PythonVersion39)'
55+
BWFilter: 'cp39-win32'
56+
x86 Python 3.10:
57+
PythonArchitecture: 'x86'
58+
PythonVersion: '$(PythonVersion310)'
59+
BWFilter: 'cp310-win32'
60+
x86 Python 3.11:
61+
PythonArchitecture: 'x86'
62+
PythonVersion: '$(PythonVersion311)'
63+
BWFilter: 'cp311-win32'
64+
6565
steps:
6666
- template: /.azure-pipelines/use-python-version.yml
6767
parameters:
@@ -76,12 +76,33 @@ jobs:
7676
displayName: 'Install dependencies'
7777
env:
7878
PYTHONWARNINGS: ignore:DEPRECATION
79-
79+
8080
- pwsh: |
81-
python -m pip install cibuildwheel==2.10.1
82-
displayName: Install cibuildwheel 2.10.1
81+
Invoke-WebRequest "$(VS_INSTALLER_URL)" -OutFile "$(VS_INSTALLER_PATH)"
82+
# In order of component appearance in the install command below, these are the names of the components
83+
# as they in the VS Installer UI. (What you would do locally.)
84+
# C# and Visual Basic Roslyn Compilers (components pane)
85+
# C++ 2022 Redistributable Update (components pane)
86+
# C++ CMake tools for Windows (components pane)
87+
# MSBuild (components pane)
88+
# MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) (components pane)
89+
# Native Desktop Workload (workloads pane)
90+
$(VS_INSTALLER_PATH) --installPath $(VS_ENTERPRISE_PATH) `
91+
--add Microsoft.VisualStudio.Component.Roslyn.Compiler `
92+
--add Microsoft.VisualStudio.Component.VC.Redist.14.Latest `
93+
--add Microsoft.VisualStudio.Component.VC.CMake.Project `
94+
--add Microsoft.Component.MSBuild `
95+
--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
96+
--add Microsoft.VisualStudio.Workload.NativeDesktop `
97+
--quiet --wait --norestart
98+
displayName: Install build script requirements
99+
100+
- script: |
101+
python -m pip install cibuildwheel==2.16.2
102+
displayName: Install cibuildwheel 2.16.2
83103
84104
- pwsh: |
105+
call "$(VS_ENTERPRISE_PATH)\VC\Auxiliary\Build\vcvars64.bat"
85106
cibuildwheel --output-dir dist .
86107
displayName: 'Build uAMQP Wheel'
87108
env:
@@ -135,10 +156,6 @@ jobs:
135156
strategy:
136157
maxParallel: 1
137158
matrix:
138-
Python 3.7:
139-
PythonBin: 'python3'
140-
PythonVersion: '$(PythonVersion37)'
141-
BWFilter: 'cp37-macosx_x86_64'
142159
Python 3.8:
143160
PythonBin: 'python3'
144161
PythonVersion: '$(PythonVersion38)'
@@ -155,15 +172,19 @@ jobs:
155172
PythonBin: 'python3'
156173
PythonVersion: '$(PythonVersion311)'
157174
BWFilter: 'cp311-macosx_x86_64'
175+
Python 3.12:
176+
PythonBin: 'python3'
177+
PythonVersion: '$(PythonVersion312)'
178+
BWFilter: 'cp312-macosx_x86_64'
158179

159180
variables:
160181
MacOSXDeploymentTarget: '10.9'
161182
OpenSSLDir: $(Agent.BuildDirectory)/openssl-macosx$(MacOSXDeploymentTarget)
162-
PythonVersion37: '3.7.6'
163183
PythonVersion38: '3.8.2'
164184
PythonVersion39: '3.9.0'
165185
PythonVersion310: '3.10.0'
166186
PythonVersion311: '3.11.0'
187+
PythonVersion312: '3.12.0'
167188

168189
steps:
169190
- task: DownloadPipelineArtifact@1
@@ -200,8 +221,8 @@ jobs:
200221
201222
- bash: |
202223
set -o errexit
203-
$(PythonBin) -m pip install --user cibuildwheel==2.10.1 --force
204-
displayName: Install cibuildwheel 2.10.1
224+
$(PythonBin) -m pip install --user cibuildwheel==2.16.2 --force
225+
displayName: Install cibuildwheel 2.16.2
205226
206227
- pwsh: |
207228
cibuildwheel --output-dir dist .
@@ -266,9 +287,6 @@ jobs:
266287
strategy:
267288
maxParallel: 1
268289
matrix:
269-
Python 3.7:
270-
PythonVersion: '$(PythonVersion37)'
271-
BWFilter: 'cp37-manylinux_x86_64'
272290
Python 3.8:
273291
PythonVersion: '$(PythonVersion38)'
274292
BWFilter: 'cp38-manylinux_x86_64'
@@ -281,6 +299,9 @@ jobs:
281299
Python 3.11:
282300
PythonVersion: '$(PythonVersion311)'
283301
BWFilter: 'cp311-manylinux_x86_64'
302+
Python 3.12:
303+
PythonVersion: '$(PythonVersion312)'
304+
BWFilter: 'cp312-manylinux_x86_64'
284305

285306
steps:
286307
- template: /.azure-pipelines/use-python-version.yml
@@ -303,8 +324,8 @@ jobs:
303324
304325
- bash: |
305326
set -o errexit
306-
python -m pip install cibuildwheel==2.10.1
307-
displayName: Install cibuildwheel 2.10.1
327+
python -m pip install cibuildwheel==2.16.2
328+
displayName: Install cibuildwheel 2.16.2
308329
309330
- pwsh: |
310331
cibuildwheel --output-dir dist .
@@ -358,17 +379,17 @@ jobs:
358379
vmImage: windows-2022
359380
strategy:
360381
matrix:
361-
EventHub x64 Python 3.7:
362-
PythonVersion: '$(PythonVersion37)'
382+
EventHub x64 Python 3.8:
383+
PythonVersion: '$(PythonVersion38)'
363384
SDK: 'EventHub'
364-
EventHub x64 Python 3.11:
365-
PythonVersion: '$(PythonVersion311)'
385+
EventHub x64 Python 3.12:
386+
PythonVersion: '$(PythonVersion312)'
366387
SDK: 'EventHub'
367-
ServiceBus x64 Python 3.7:
368-
PythonVersion: '$(PythonVersion37)'
388+
ServiceBus x64 Python 3.8:
389+
PythonVersion: '$(PythonVersion38)'
369390
SDK: 'ServiceBus'
370-
ServiceBus x64 Python 3.11:
371-
PythonVersion: '$(PythonVersion311)'
391+
ServiceBus x64 Python 3.12:
392+
PythonVersion: '$(PythonVersion312)'
372393
SDK: 'ServiceBus'
373394
variables:
374395
PythonArchitecture: 'x64'
@@ -389,15 +410,15 @@ jobs:
389410
vmImage: 'macOS-11'
390411
strategy:
391412
matrix:
392-
EventHub Python 3.11:
413+
EventHub Python 3.12:
393414
SDK: 'EventHub'
394-
ServiceBus Python 3.11:
415+
ServiceBus Python 3.12:
395416
SDK: 'ServiceBus'
396417
variables:
397418
PythonBin: 'python3'
398-
PythonVersion: '3.11.0'
419+
PythonVersion: '3.12.0'
399420
MacOSXDeploymentTarget: '10.9'
400-
PythonVersion382: '3.11'
421+
PythonVersion382: '3.12'
401422
OSArch: 'MacOS'
402423
DownloadArtifactFolder: 'uamqp-macosx$(MacOSXDeploymentTarget)-$(PythonVersion)-whl'
403424
steps:
@@ -417,14 +438,14 @@ jobs:
417438
EventHub Python 3.9:
418439
PythonVersion: '$(PythonVersion39)'
419440
SDK: 'EventHub'
420-
EventHub Python 3.11:
421-
PythonVersion: '$(PythonVersion311)'
441+
EventHub Python 3.12:
442+
PythonVersion: '$(PythonVersion312)'
422443
SDK: 'EventHub'
423444
ServiceBus Python 3.9:
424445
PythonVersion: '$(PythonVersion39)'
425446
SDK: 'ServiceBus'
426-
ServiceBus Python 3.11:
427-
PythonVersion: '$(PythonVersion311)'
447+
ServiceBus Python 3.12:
448+
PythonVersion: '$(PythonVersion312)'
428449
SDK: 'ServiceBus'
429450
variables:
430451
OSArch: 'Linux'

0 commit comments

Comments
 (0)