From 3542bca2639a428e1796aaa6a2ffef0c0f575566 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 30 May 2023 15:00:26 +0200 Subject: [PATCH] Add warning for python 2.7 on release/v3 (#674) * add warning * npm run format * remove ubuntu-18.04 --- .github/workflows/test-pypy.yml | 2 +- .github/workflows/test-python.yml | 6 +++--- dist/setup/index.js | 3 +++ src/setup-python.ts | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-pypy.yml b/.github/workflows/test-pypy.yml index 2bd0441..520a794 100644 --- a/.github/workflows/test-pypy.yml +++ b/.github/workflows/test-pypy.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-latest] pypy: - 'pypy-2.7' - 'pypy-3.7' diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 8f23301..80c8be7 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] + os: [macos-latest, windows-latest, ubuntu-20.04] steps: - name: Checkout uses: actions/checkout@v2 @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] + os: [macos-latest, windows-latest, ubuntu-20.04] python: [3.5.4, 3.6.7, 3.7.5, 3.8.1] steps: - name: Checkout @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] + os: [macos-latest, windows-latest, ubuntu-20.04] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/dist/setup/index.js b/dist/setup/index.js index 0448f36..7167da1 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -6479,6 +6479,9 @@ function run() { core.info(`Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})`); } else { + if (version.trim().startsWith('2')) { + core.warning('The support for python 2.7 will be removed on June 19. Related issue: https://github.com/actions/setup-python/issues/672'); + } const installed = yield finder.useCpythonVersion(version, arch); pythonVersion = installed.version; core.info(`Successfully setup ${installed.impl} (${pythonVersion})`); diff --git a/src/setup-python.ts b/src/setup-python.ts index 2f94657..9231b31 100644 --- a/src/setup-python.ts +++ b/src/setup-python.ts @@ -34,6 +34,11 @@ async function run() { `Successfully setup PyPy ${installed.resolvedPyPyVersion} with Python (${installed.resolvedPythonVersion})` ); } else { + if (version.trim().startsWith('2')) { + core.warning( + 'The support for python 2.7 will be removed on June 19. Related issue: https://github.com/actions/setup-python/issues/672' + ); + } const installed = await finder.useCpythonVersion(version, arch); pythonVersion = installed.version; core.info(`Successfully setup ${installed.impl} (${pythonVersion})`);