From ea76a3728bd50b2caa6a8134d32c38b13530d60f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 8 Oct 2019 15:56:53 +0200 Subject: CI: switch the xenial test job to Python 3 This job tests our oldest supported setup. Switch it to Python 3 so we can drop Python 2 support. --- .gitlab-ci/Dockerfile.old | 4 ++-- .gitlab-ci/run-docker-old.sh | 2 +- .gitlab-ci/test-docker-old.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to '.gitlab-ci') diff --git a/.gitlab-ci/Dockerfile.old b/.gitlab-ci/Dockerfile.old index fa135de7..7f53e40f 100644 --- a/.gitlab-ci/Dockerfile.old +++ b/.gitlab-ci/Dockerfile.old @@ -17,8 +17,8 @@ RUN apt-get update && apt-get install -y \ libgtk-3-0 \ libtool \ locales \ - python-dev \ - python-virtualenv \ + python3-dev \ + python3-venv \ xauth \ xvfb \ && rm -rf /var/lib/apt/lists/* diff --git a/.gitlab-ci/run-docker-old.sh b/.gitlab-ci/run-docker-old.sh index 4dd17520..6f6a1d68 100755 --- a/.gitlab-ci/run-docker-old.sh +++ b/.gitlab-ci/run-docker-old.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v2" +TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v3" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile.old" . diff --git a/.gitlab-ci/test-docker-old.sh b/.gitlab-ci/test-docker-old.sh index 91312c7c..8d451bc0 100755 --- a/.gitlab-ci/test-docker-old.sh +++ b/.gitlab-ci/test-docker-old.sh @@ -2,8 +2,8 @@ set -e -python --version -virtualenv --python=python _venv +python3 --version +python3 -m venv _venv source _venv/bin/activate # ccache setup -- cgit v1.2.1