From a4bfa98a73655430a2dc021cc1dadf060df21981 Mon Sep 17 00:00:00 2001 From: gargsaumya Date: Tue, 19 May 2026 14:15:26 +0530 Subject: [PATCH] CHORE: Update Python versions, drop EOL 3.10, upgrade Ubuntu 22.04->24.04 in test matrix --- .../variables/common-variables.yml | 2 +- eng/pipelines/pr-validation-pipeline.yml | 20 ++++++++++--------- pyproject.toml | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/OneBranchPipelines/variables/common-variables.yml b/OneBranchPipelines/variables/common-variables.yml index 3597f4192..08d47fded 100644 --- a/OneBranchPipelines/variables/common-variables.yml +++ b/OneBranchPipelines/variables/common-variables.yml @@ -16,7 +16,7 @@ variables: # Python versions to build - name: PYTHON_VERSIONS - value: '3.10,3.11,3.12,3.13' + value: '3.11,3.12,3.13,3.14' # Package name - name: PACKAGE_NAME diff --git a/eng/pipelines/pr-validation-pipeline.yml b/eng/pipelines/pr-validation-pipeline.yml index b70b1ac77..cb1bb8cb9 100644 --- a/eng/pipelines/pr-validation-pipeline.yml +++ b/eng/pipelines/pr-validation-pipeline.yml @@ -469,16 +469,18 @@ jobs: SQL2022: sqlServerImage: 'mcr.microsoft.com/mssql/server:2022-latest' sqlVersion: 'SQL2022' + pythonVersion: '3.13' SQL2025: sqlServerImage: 'mcr.microsoft.com/mssql/server:2025-latest' sqlVersion: 'SQL2025' + pythonVersion: '3.14' steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.13' + versionSpec: '$(pythonVersion)' addToPath: true - displayName: 'Use Python 3.13 on macOS' + displayName: 'Use Python $(pythonVersion) on macOS' - script: | brew update @@ -640,18 +642,18 @@ jobs: strategy: matrix: Ubuntu: - dockerImage: 'ubuntu:22.04' + dockerImage: 'ubuntu:24.04' distroName: 'Ubuntu' sqlServerImage: 'mcr.microsoft.com/mssql/server:2022-latest' useAzureSQL: 'false' Ubuntu_SQL2025: - dockerImage: 'ubuntu:22.04' + dockerImage: 'ubuntu:24.04' distroName: 'Ubuntu-SQL2025' sqlServerImage: 'mcr.microsoft.com/mssql/server:2025-latest' useAzureSQL: 'false' ${{ if ne(variables['AZURE_CONNECTION_STRING'], '') }}: Ubuntu_AzureSQL: - dockerImage: 'ubuntu:22.04' + dockerImage: 'ubuntu:24.04' distroName: 'Ubuntu-AzureSQL' sqlServerImage: '' useAzureSQL: 'true' @@ -742,7 +744,7 @@ jobs: # Download the package to configure the Microsoft repo if [ '$(distroName)' = 'Ubuntu' ]; then - curl -sSL -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb + curl -sSL -O https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb else # Debian 12 curl -sSL -O https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb @@ -898,7 +900,7 @@ jobs: # Add Microsoft repository curl -sSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - - curl -sSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list + curl -sSL https://packages.microsoft.com/config/ubuntu/24.04/prod.list > /etc/apt/sources.list.d/mssql-release.list # Update package lists apt-get update -qq @@ -968,7 +970,7 @@ jobs: strategy: matrix: Ubuntu_ARM64: - dockerImage: 'ubuntu:22.04' + dockerImage: 'ubuntu:24.04' distroName: 'Ubuntu' archName: 'arm64' Debian_ARM64: @@ -1066,7 +1068,7 @@ jobs: # Download the package to configure the Microsoft repo if [ '$(distroName)' = 'Ubuntu' ]; then - curl -sSL -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb + curl -sSL -O https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb else # Debian 12 curl -sSL -O https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb diff --git a/pyproject.toml b/pyproject.toml index 538a4a992..d41dfc13d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.black] line-length = 100 -target-version = ['py38', 'py39', 'py310', 'py311'] +target-version = ['py311', 'py312', 'py313', 'py314'] include = '\.pyi?$' extend-exclude = ''' /(