Skip to content

Commit

Permalink
Py312 (#370)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
kashifkhan authored Nov 16, 2023
1 parent e506d70 commit 9571859
Show file tree
Hide file tree
Showing 9 changed files with 146 additions and 94 deletions.
137 changes: 79 additions & 58 deletions .azure-pipelines/client.test.live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@ trigger:
- main

variables:
PythonVersion37: '3.7'
PythonVersion38: '3.8'
PythonVersion39: '3.9'
PythonVersion310: '3.10.0'
PythonVersion311: '3.11.0'
PythonVersion312: '3.12.0'
GetPip: 'https://bootstrap.pypa.io/get-pip.py'

jobs:
- job: 'Windows'

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

timeoutInMinutes: 120

strategy:
maxParallel: 1
matrix:
x64 Python 3.7:
PythonArchitecture: 'x64'
PythonVersion: '$(PythonVersion37)'
BWFilter: 'cp37-win_amd64'
x64 Python 3.8:
PythonArchitecture: 'x64'
PythonVersion: '$(PythonVersion38)'
Expand All @@ -41,27 +41,27 @@ jobs:
PythonArchitecture: 'x64'
PythonVersion: '$(PythonVersion311)'
BWFilter: 'cp311-win_amd64'
# x86 Python 3.7:
# PythonArchitecture: 'x86'
# PythonVersion: '$(PythonVersion37)'
# BWFilter: 'cp37-win32'
# x86 Python 3.8:
# PythonArchitecture: 'x86'
# PythonVersion: '$(PythonVersion38)'
# BWFilter: 'cp38-win32'
# x86 Python 3.9:
# PythonArchitecture: 'x86'
# PythonVersion: '$(PythonVersion39)'
# BWFilter: 'cp39-win32'
# x86 Python 3.10:
# PythonArchitecture: 'x86'
# PythonVersion: '$(PythonVersion310)'
# BWFilter: 'cp310-win32'
# x86 Python 3.11:
# PythonArchitecture: 'x86'
# PythonVersion: '$(PythonVersion311)'
# BWFilter: 'cp311-win32'

x64 Python 3.12:
PythonArchitecture: 'x64'
PythonVersion: '$(PythonVersion312)'
BWFilter: 'cp312-win_amd64'
x86 Python 3.8:
PythonArchitecture: 'x86'
PythonVersion: '$(PythonVersion38)'
BWFilter: 'cp38-win32'
x86 Python 3.9:
PythonArchitecture: 'x86'
PythonVersion: '$(PythonVersion39)'
BWFilter: 'cp39-win32'
x86 Python 3.10:
PythonArchitecture: 'x86'
PythonVersion: '$(PythonVersion310)'
BWFilter: 'cp310-win32'
x86 Python 3.11:
PythonArchitecture: 'x86'
PythonVersion: '$(PythonVersion311)'
BWFilter: 'cp311-win32'
steps:
- template: /.azure-pipelines/use-python-version.yml
parameters:
Expand All @@ -76,12 +76,33 @@ jobs:
displayName: 'Install dependencies'
env:
PYTHONWARNINGS: ignore:DEPRECATION
- pwsh: |
python -m pip install cibuildwheel==2.10.1
displayName: Install cibuildwheel 2.10.1
Invoke-WebRequest "$(VS_INSTALLER_URL)" -OutFile "$(VS_INSTALLER_PATH)"
# In order of component appearance in the install command below, these are the names of the components
# as they in the VS Installer UI. (What you would do locally.)
# C# and Visual Basic Roslyn Compilers (components pane)
# C++ 2022 Redistributable Update (components pane)
# C++ CMake tools for Windows (components pane)
# MSBuild (components pane)
# MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) (components pane)
# Native Desktop Workload (workloads pane)
$(VS_INSTALLER_PATH) --installPath $(VS_ENTERPRISE_PATH) `
--add Microsoft.VisualStudio.Component.Roslyn.Compiler `
--add Microsoft.VisualStudio.Component.VC.Redist.14.Latest `
--add Microsoft.VisualStudio.Component.VC.CMake.Project `
--add Microsoft.Component.MSBuild `
--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
--add Microsoft.VisualStudio.Workload.NativeDesktop `
--quiet --wait --norestart
displayName: Install build script requirements
- script: |
python -m pip install cibuildwheel==2.16.2
displayName: Install cibuildwheel 2.16.2
- pwsh: |
call "$(VS_ENTERPRISE_PATH)\VC\Auxiliary\Build\vcvars64.bat"
cibuildwheel --output-dir dist .
displayName: 'Build uAMQP Wheel'
env:
Expand Down Expand Up @@ -135,10 +156,6 @@ jobs:
strategy:
maxParallel: 1
matrix:
Python 3.7:
PythonBin: 'python3'
PythonVersion: '$(PythonVersion37)'
BWFilter: 'cp37-macosx_x86_64'
Python 3.8:
PythonBin: 'python3'
PythonVersion: '$(PythonVersion38)'
Expand All @@ -155,15 +172,19 @@ jobs:
PythonBin: 'python3'
PythonVersion: '$(PythonVersion311)'
BWFilter: 'cp311-macosx_x86_64'
Python 3.12:
PythonBin: 'python3'
PythonVersion: '$(PythonVersion312)'
BWFilter: 'cp312-macosx_x86_64'

variables:
MacOSXDeploymentTarget: '10.9'
OpenSSLDir: $(Agent.BuildDirectory)/openssl-macosx$(MacOSXDeploymentTarget)
PythonVersion37: '3.7.6'
PythonVersion38: '3.8.2'
PythonVersion39: '3.9.0'
PythonVersion310: '3.10.0'
PythonVersion311: '3.11.0'
PythonVersion312: '3.12.0'

steps:
- task: DownloadPipelineArtifact@1
Expand Down Expand Up @@ -200,8 +221,8 @@ jobs:
- bash: |
set -o errexit
$(PythonBin) -m pip install --user cibuildwheel==2.10.1 --force
displayName: Install cibuildwheel 2.10.1
$(PythonBin) -m pip install --user cibuildwheel==2.16.2 --force
displayName: Install cibuildwheel 2.16.2
- pwsh: |
cibuildwheel --output-dir dist .
Expand Down Expand Up @@ -266,9 +287,6 @@ jobs:
strategy:
maxParallel: 1
matrix:
Python 3.7:
PythonVersion: '$(PythonVersion37)'
BWFilter: 'cp37-manylinux_x86_64'
Python 3.8:
PythonVersion: '$(PythonVersion38)'
BWFilter: 'cp38-manylinux_x86_64'
Expand All @@ -281,6 +299,9 @@ jobs:
Python 3.11:
PythonVersion: '$(PythonVersion311)'
BWFilter: 'cp311-manylinux_x86_64'
Python 3.12:
PythonVersion: '$(PythonVersion312)'
BWFilter: 'cp312-manylinux_x86_64'

steps:
- template: /.azure-pipelines/use-python-version.yml
Expand All @@ -303,8 +324,8 @@ jobs:
- bash: |
set -o errexit
python -m pip install cibuildwheel==2.10.1
displayName: Install cibuildwheel 2.10.1
python -m pip install cibuildwheel==2.16.2
displayName: Install cibuildwheel 2.16.2
- pwsh: |
cibuildwheel --output-dir dist .
Expand Down Expand Up @@ -358,17 +379,17 @@ jobs:
vmImage: windows-2022
strategy:
matrix:
EventHub x64 Python 3.7:
PythonVersion: '$(PythonVersion37)'
EventHub x64 Python 3.8:
PythonVersion: '$(PythonVersion38)'
SDK: 'EventHub'
EventHub x64 Python 3.11:
PythonVersion: '$(PythonVersion311)'
EventHub x64 Python 3.12:
PythonVersion: '$(PythonVersion312)'
SDK: 'EventHub'
ServiceBus x64 Python 3.7:
PythonVersion: '$(PythonVersion37)'
ServiceBus x64 Python 3.8:
PythonVersion: '$(PythonVersion38)'
SDK: 'ServiceBus'
ServiceBus x64 Python 3.11:
PythonVersion: '$(PythonVersion311)'
ServiceBus x64 Python 3.12:
PythonVersion: '$(PythonVersion312)'
SDK: 'ServiceBus'
variables:
PythonArchitecture: 'x64'
Expand All @@ -389,15 +410,15 @@ jobs:
vmImage: 'macOS-11'
strategy:
matrix:
EventHub Python 3.11:
EventHub Python 3.12:
SDK: 'EventHub'
ServiceBus Python 3.11:
ServiceBus Python 3.12:
SDK: 'ServiceBus'
variables:
PythonBin: 'python3'
PythonVersion: '3.11.0'
PythonVersion: '3.12.0'
MacOSXDeploymentTarget: '10.9'
PythonVersion382: '3.11'
PythonVersion382: '3.12'
OSArch: 'MacOS'
DownloadArtifactFolder: 'uamqp-macosx$(MacOSXDeploymentTarget)-$(PythonVersion)-whl'
steps:
Expand All @@ -417,14 +438,14 @@ jobs:
EventHub Python 3.9:
PythonVersion: '$(PythonVersion39)'
SDK: 'EventHub'
EventHub Python 3.11:
PythonVersion: '$(PythonVersion311)'
EventHub Python 3.12:
PythonVersion: '$(PythonVersion312)'
SDK: 'EventHub'
ServiceBus Python 3.9:
PythonVersion: '$(PythonVersion39)'
SDK: 'ServiceBus'
ServiceBus Python 3.11:
PythonVersion: '$(PythonVersion311)'
ServiceBus Python 3.12:
PythonVersion: '$(PythonVersion312)'
SDK: 'ServiceBus'
variables:
OSArch: 'Linux'
Expand Down
Loading

0 comments on commit 9571859

Please sign in to comment.