Skip to content

Commit 6b02f07

Browse files
author
Vladimir Safonkin
committed
Remove Ubuntu 16.04 from images
1 parent 42ff8b9 commit 6b02f07

4 files changed

Lines changed: 3 additions & 27 deletions

File tree

.github/workflows/releases-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [macos-latest, windows-latest, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04]
17+
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
1818
python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
1919
steps:
2020
- name: setup-python ${{ matrix.python }}

azure-pipelines/build-python-packages.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,6 @@ stages:
2222
jobs:
2323
- template: /azure-pipelines/templates/test-job.yml
2424

25-
- stage: Build_Python_Ubuntu_1604
26-
dependsOn: []
27-
variables:
28-
VmImage: 'ubuntu-16.04'
29-
Platform: linux-16.04
30-
Architecture: x64
31-
jobs:
32-
- template: /azure-pipelines/templates/build-job.yml
33-
34-
- stage: Test_Python_Ubuntu_1604
35-
condition: succeeded()
36-
dependsOn: Build_Python_Ubuntu_1604
37-
variables:
38-
VmImage: 'ubuntu-16.04'
39-
Platform: linux-16.04
40-
Architecture: x64
41-
jobs:
42-
- template: /azure-pipelines/templates/test-job.yml
43-
4425
- stage: Build_Python_Ubuntu_1804
4526
dependsOn: []
4627
variables:

builders/ubuntu-python-builder.psm1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ class UbuntuPythonBuilder : NixPythonBuilder {
8686
Execute-Command -Command "sudo apt install -y $_"
8787
}
8888

89-
if ($this.Platform -ne "linux-16.04") {
90-
### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev
91-
Execute-Command -Command "sudo apt install -y libgdbm-compat-dev"
92-
}
93-
89+
### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev
90+
Execute-Command -Command "sudo apt install -y libgdbm-compat-dev"
9491
}
9592
}

tests/ManifestConfig.Tests.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ $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-16.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "16.04"; arch = "x64"} },
98
@{ ReleaseName = "python-3.8.3-linux-18.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "18.04"; arch = "x64"} },
109
@{ ReleaseName = "python-3.8.3-linux-20.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "20.04"; arch = "x64"} },
1110
@{ ReleaseName = "python-3.8.3-win32-x64.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x64"} },
@@ -14,7 +13,6 @@ $stableTestCases = @(
1413

1514
$unstableTestCases = @(
1615
@{ ReleaseName = "python-3.9.0-alpha.2-darwin-x64.tar.gz"; ExpectedResult = @{ platform = "darwin"; platform_version = $null; arch = "x64"} },
17-
@{ ReleaseName = "python-3.9.0-beta.1-linux-16.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "16.04"; arch = "x64"} },
1816
@{ ReleaseName = "python-3.9.0-rc.4-linux-18.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "18.04"; arch = "x64"} },
1917
@{ ReleaseName = "python-3.9.0-beta.2-linux-20.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "20.04"; arch = "x64"} },
2018
@{ ReleaseName = "python-3.9.0-beta.2-win32-x64.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x64"} },

0 commit comments

Comments
 (0)