Skip to content

Commit 256e6dd

Browse files
authored
Remove code related to Ubuntu 18.04. (actions#226)
1 parent c6bbc68 commit 256e6dd

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

.github/workflows/build-python-packages.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
PLATFORMS:
1616
description: 'Platforms for execution in "os" or "os_arch" format (arch is "x64" by default)'
1717
required: true
18-
default: 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,macos-11,windows-2019_x64,windows-2019_x86'
18+
default: 'ubuntu-20.04,ubuntu-22.04,macos-11,windows-2019_x64,windows-2019_x86'
1919
pull_request:
2020
paths-ignore:
2121
- 'versions-manifest.json'
@@ -39,7 +39,7 @@ jobs:
3939
- name: Generate execution matrix
4040
id: generate-matrix
4141
run: |
42-
[String[]]$configurations = "${{ inputs.platforms || 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,macos-11,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
42+
[String[]]$configurations = "${{ inputs.platforms || 'ubuntu-20.04,ubuntu-22.04,macos-11,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
4343
$matrix = @()
4444
4545
foreach ($configuration in $configurations) {

.github/workflows/releases-validation.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
18-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
17+
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
18+
python: [3.9.12, 3.10.8, 3.11.10]
1919
steps:
2020
- name: setup-python ${{ matrix.python }}
2121
uses: actions/setup-python@v4

.github/workflows/test-python-version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
20+
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
2121
steps:
2222
- name: Setup Python ${{ github.event.inputs.version }}
2323
uses: actions/setup-python@main

tests/ManifestConfig.Tests.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ $Configuration = Read-ConfigurationFile -Filepath $ConfigurationFile
55

66
$stableTestCases = @(
77
@{ ReleaseName = "python-3.8.3-darwin-x64.tar.gz"; ExpectedResult = @{ platform = "darwin"; platform_version = $null; arch = "x64"} },
8-
@{ ReleaseName = "python-3.8.3-linux-18.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "18.04"; arch = "x64"} },
98
@{ ReleaseName = "python-3.8.3-linux-20.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "20.04"; arch = "x64"} },
9+
@{ ReleaseName = "python-3.8.3-linux-22.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "22.04"; arch = "x64"} },
1010
@{ ReleaseName = "python-3.8.3-win32-x64.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x64"} },
1111
@{ ReleaseName = "python-3.8.3-win32-x86.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x86"} }
1212
) | ForEach-Object { $_.Configuration = $Configuration; $_ }
1313

1414
$unstableTestCases = @(
1515
@{ ReleaseName = "python-3.9.0-alpha.2-darwin-x64.tar.gz"; ExpectedResult = @{ platform = "darwin"; platform_version = $null; arch = "x64"} },
16-
@{ ReleaseName = "python-3.9.0-rc.4-linux-18.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "18.04"; arch = "x64"} },
1716
@{ ReleaseName = "python-3.9.0-beta.2-linux-20.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "20.04"; arch = "x64"} },
17+
@{ ReleaseName = "python-3.9.0-rc.4-linux-22.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "22.04"; arch = "x64"} },
1818
@{ ReleaseName = "python-3.9.0-beta.2-win32-x64.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x64"} },
1919
@{ ReleaseName = "python-3.9.0-beta.2-win32-x86.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x86"} }
2020
) | ForEach-Object { $_.Configuration = $Configuration; $_ }

tests/sources/python-modules.py

-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import importlib
99
import sys
10-
import platform
1110

1211
# The Python standard library as of Python 3.0
1312
standard_library = [
@@ -266,11 +265,6 @@ def replace(lst, old, new):
266265
if sys.version_info >= (3, 11):
267266
standard_library.remove('binhex')
268267

269-
# Exclude tkinter and turtle for Python 3.11 alpha temporarily
270-
if sys.version_info >= (3, 11) and platform.system() == 'Linux' and '18.04' in platform.version():
271-
standard_library.remove('tkinter')
272-
standard_library.remove('turtle')
273-
274268
# 'smtpd', 'asyncore' and 'asynchat' modules have been removed from Python 3.12
275269
if sys.version_info >= (3, 12):
276270
standard_library.remove('smtpd')

0 commit comments

Comments
 (0)