Skip to content

Commit 7247b1c

Browse files
committed
ci: Bump Ubuntu to 18.04 LTS.
Ubuntu 16.04 LTS went EOL at the end of April 2021.
1 parent f5880d2 commit 7247b1c

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ jobs:
2222
matrix:
2323
include:
2424
- name-suffix: "(Minimum Versions)"
25-
os: ubuntu-16.04
25+
os: ubuntu-18.04
2626
python-version: 3.7
2727
extra-requirements: '-c requirements/testing/minver.txt'
2828
pyqt5-ver: '==5.8 sip==4.19.7' # oldest versions with a Py3.7 wheel.
2929
delete-font-cache: true
3030
XVFB_RUN: xvfb-run -a
31-
- os: ubuntu-16.04
31+
- os: ubuntu-18.04
3232
python-version: 3.7
3333
extra-requirements: '-r requirements/testing/extra.txt'
3434
XVFB_RUN: xvfb-run -a
3535
CFLAGS: "-fno-lto" # Ensure that disabling LTO works.
36-
- os: ubuntu-16.04
36+
- os: ubuntu-18.04
3737
python-version: 3.8
3838
extra-requirements: '-r requirements/testing/extra.txt'
3939
XVFB_RUN: xvfb-run -a
@@ -156,12 +156,8 @@ jobs:
156156
# libraries cannot be loaded at runtime, so an actual import is a
157157
# better check).
158158
if [[ "${{ runner.os }}" != 'macOS' ]]; then
159-
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12;
160-
# pycairo 1.20+ requires a new version of Cairo, unavailable on
161-
# Ubuntu 16.04, so PyGObject must be installed without build
162-
# isolation in order to pick up the lower pre-installed version.
163-
python -m pip install --upgrade 'pycairo<1.20.0' 'cairocffi>=0.8' &&
164-
python -m pip install --upgrade --no-build-isolation PyGObject &&
159+
# PyGObject, pycairo, and cariocffi do not install on OSX 10.12.
160+
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&
165161
python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
166162
echo 'PyGObject is available' ||
167163
echo 'PyGObject is not available'
@@ -180,7 +176,7 @@ jobs:
180176
echo 'PySide2 is not available'
181177
fi
182178
python -m pip install --upgrade \
183-
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04 \
179+
-f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 \
184180
wxPython &&
185181
python -c 'import wx' &&
186182
echo 'wxPython is available' ||

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
strategy:
77
matrix:
88
Linux_py37:
9-
vmImage: 'ubuntu-16.04'
9+
vmImage: 'ubuntu-18.04'
1010
python.version: '3.7'
1111
Linux_py38:
12-
vmImage: 'ubuntu-16.04'
12+
vmImage: 'ubuntu-18.04'
1313
python.version: '3.8'
1414
Linux_py39:
15-
vmImage: 'ubuntu-16.04'
15+
vmImage: 'ubuntu-18.04'
1616
python.version: '3.9'
1717
macOS_py37:
1818
vmImage: 'macOS-10.15'

0 commit comments

Comments
 (0)