[pygobject/ci-old-py3] CI: switch the xenial test job to Python 3
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject/ci-old-py3] CI: switch the xenial test job to Python 3
- Date: Tue, 8 Oct 2019 13:58:58 +0000 (UTC)
commit ab52acd77e7d0561169ae29c656da9649ea72f9f
Author: Christoph Reiter <reiter christoph gmail com>
Date: Tue Oct 8 15:56:53 2019 +0200
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.yml | 2 +-
.gitlab-ci/Dockerfile.old | 3 +--
.gitlab-ci/run-docker-old.sh | 2 +-
.gitlab-ci/test-docker-old.sh | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f0149e0..ee89057a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,7 @@ pypy3.6:
xenial-i386-py2:
stage: build_and_test
- image: registry.gitlab.gnome.org/gnome/pygobject/old:v2
+ image: registry.gitlab.gnome.org/gnome/pygobject/old:v3
artifacts:
paths:
- coverage/
diff --git a/.gitlab-ci/Dockerfile.old b/.gitlab-ci/Dockerfile.old
index fa135de7..7988f64b 100644
--- a/.gitlab-ci/Dockerfile.old
+++ b/.gitlab-ci/Dockerfile.old
@@ -17,8 +17,7 @@ RUN apt-get update && apt-get install -y \
libgtk-3-0 \
libtool \
locales \
- python-dev \
- python-virtualenv \
+ python3-dev \
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]