From d8edb781b4f82e09ef5dc6f84d4e0a0e8e04996e Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Fri, 24 Feb 2023 10:58:50 -0800 Subject: [PATCH] settle on 3.10 and eliminate warnings for exact specification. update the version of ubuntu that we're installing the python version from --- eng/pipelines/apiview-review-gen-python.yml | 2 +- .../templates/stages/archetype-sdk-tool-python.yml | 10 +--------- packages/python-packages/api-stub-generator/ci.yml | 2 +- scripts/python/util/install_python_version.py | 2 +- src/dotnet/APIView/apiview.yml | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/apiview-review-gen-python.yml b/eng/pipelines/apiview-review-gen-python.yml index f3811cfe7d3..24f767d66fc 100644 --- a/eng/pipelines/apiview-review-gen-python.yml +++ b/eng/pipelines/apiview-review-gen-python.yml @@ -19,7 +19,7 @@ parameters: variables: PythonIndexUrl: 'https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/' - PythonVersion: '3.10.9' + PythonVersion: '3.10' ApiStubVersion: '0.3.5' jobs: diff --git a/eng/pipelines/templates/stages/archetype-sdk-tool-python.yml b/eng/pipelines/templates/stages/archetype-sdk-tool-python.yml index 746b6f499b9..462b9dc201e 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-tool-python.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-tool-python.yml @@ -1,7 +1,7 @@ parameters: - name: PythonVersion type: string - default: '3.10.9' + default: '3.10' - name: PackagePath type: string default: '' @@ -39,14 +39,6 @@ stages: python --version pip install virtualenv aiohttp chardet trio setuptools wheel packaging displayName: 'Setup Python Environment' - - # # tried to link 8 to 7, but got permission denied. - # # find /usr/lib -name "libffi.so*" - # # ln -s /usr/lib/x86_64-linux-gnu/libffi.so.8 /usr/lib/x86_64-linux-gnu/libffi.so.7 (needs sudo) - # # apt install libffi-devel (needs sudo) - # - script: | - # ln -s /usr/lib/x86_64-linux-gnu/libffi.so.8 /usr/lib/x86_64-linux-gnu/libffi.so.7 - # condition: and(succeeded(), eq(variables['Agent.OS'],'Linux')) - pwsh: | Write-Host "Bundling stable version of python api-stub-generator" diff --git a/packages/python-packages/api-stub-generator/ci.yml b/packages/python-packages/api-stub-generator/ci.yml index c69e1aaa023..1306c565c84 100644 --- a/packages/python-packages/api-stub-generator/ci.yml +++ b/packages/python-packages/api-stub-generator/ci.yml @@ -24,7 +24,7 @@ pr: extends: template: /eng/pipelines/templates/stages/archetype-sdk-tool-python.yml parameters: - PythonVersion: '3.10.2' + PythonVersion: '3.10' PackagePath: 'packages/python-packages/api-stub-generator' FeedName: 'public/azure-sdk-for-python' ArtifactName: 'apiviewparserpython' diff --git a/scripts/python/util/install_python_version.py b/scripts/python/util/install_python_version.py index 2608f5cfa3d..030899008db 100644 --- a/scripts/python/util/install_python_version.py +++ b/scripts/python/util/install_python_version.py @@ -17,7 +17,7 @@ MANIFEST_LOCATION = "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json" MAX_INSTALLER_RETRY = 3 -CURRENT_UBUNTU_VERSION = "20.04" # full title is ubuntu-20.04 +CURRENT_UBUNTU_VERSION = "22.04" # full title is ubuntu-20.04 MAX_PRECACHED_VERSION = ( "3.11.1" # reference: https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md#python ) diff --git a/src/dotnet/APIView/apiview.yml b/src/dotnet/APIView/apiview.yml index b3460509582..d02145fd35d 100644 --- a/src/dotnet/APIView/apiview.yml +++ b/src/dotnet/APIView/apiview.yml @@ -29,7 +29,7 @@ pr: - tools/apiview/parsers/js-api-parser variables: - PythonVersion: '3.10.9' + PythonVersion: '3.10' WebClientProjectDirectory: 'src/dotnet/APIView/APIViewWeb/Client' WebProjectPath: 'src/dotnet/APIView/APIViewWeb/APIViewWeb.csproj' NodeVersion: '18.x'