From c374f3b7b5c7c3a3991e319d83573ff03f027270 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 23 May 2023 15:58:13 +0200 Subject: [PATCH 1/4] add warning --- dist/setup/index.js | 3 +++ src/setup-python.ts | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dist/setup/index.js b/dist/setup/index.js index 24c41bfa9..6b34b4692 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -7010,6 +7010,9 @@ function run() { try { const version = core.getInput('python-version'); if (version) { + 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'); + } let pythonVersion; const arch = core.getInput('architecture') || os.arch(); if (isPyPyVersion(version)) { diff --git a/src/setup-python.ts b/src/setup-python.ts index 3a19efe13..07672d8fd 100644 --- a/src/setup-python.ts +++ b/src/setup-python.ts @@ -28,6 +28,11 @@ async function run() { try { const version = core.getInput('python-version'); if (version) { + 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' + ); + } let pythonVersion: string; const arch: string = core.getInput('architecture') || os.arch(); if (isPyPyVersion(version)) { From e882f95ed2a9656f622a175f8d07b67e766acbf4 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 23 May 2023 16:23:01 +0200 Subject: [PATCH 2/4] remove ubuntu-18.04 --- .github/workflows/test-pypy.yml | 2 +- .github/workflows/test-python.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-pypy.yml b/.github/workflows/test-pypy.yml index 2bd044106..520a79462 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 191db1411..befd93ed8 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 @@ -97,7 +97,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15, windows-2019, ubuntu-18.04, ubuntu-20.04] + os: [macos-10.15, windows-2019, ubuntu-20.04] steps: - name: Checkout uses: actions/checkout@v2 From 684289b00661282e47da04c6fd4cc37d24323561 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 25 May 2023 16:28:06 +0200 Subject: [PATCH 3/4] remove macos-10.15 --- .github/workflows/test-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index befd93ed8..f3aef0ea3 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -97,7 +97,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-10.15, windows-2019, ubuntu-20.04] + os: [macos-11, windows-2019, ubuntu-20.04] steps: - name: Checkout uses: actions/checkout@v2 From ec7d2836275901508046ccf82c44b4ba918a4461 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 25 May 2023 16:32:16 +0200 Subject: [PATCH 4/4] fix pypy3 --- .github/workflows/test-python.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index f3aef0ea3..4846f62d0 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -105,9 +105,4 @@ jobs: - name: setup-python pypy3 uses: ./ with: - python-version: 'pypy3' - - - name: setup-python pypy2 - uses: ./ - with: - python-version: 'pypy2' + python-version: 'pypy-3.8'